Resolve conflito

Signed-off-by: davimarinho <[email protected]>

README.md

@@ -1 +1,52 @@
 # 2023.2-UnB-TV-VideoService
+
+<div align="center">
+<img src="./docs/assets/unb-removebg-preview.png" alt="logo UNBTV"> </div>
+
+## Sobre
+
+O projeto visa o desenvolvimento de uma aplicação Web e Mobile para a UnB-TV, com o objetivo de centralizar e disponibilizar de forma unificada todo o conteúdo oferecido pela UnB-TV, incluindo vídeos e transmissões ao vivo, sendo desenvolvida no segundo semestre de 2023 pelas disciplinas de EPS e MDS da Universidade de Brasília.
+
+## Ambientes
+
+[Documentação](https://github.com/fga-eps-mds/2023.2-UnB-TV-DOC)
+[Users](https://github.com/fga-eps-mds/2023.2-UnB-TV-Users)
+[Admin](https://github.com/fga-eps-mds/2023.2-UnB-TV-Admin)
+[Video](https://github.com/fga-eps-mds/2023.2-UnB-TV-VideoService)
+[Gateway](https://github.com/fga-eps-mds/2023.2-UnB-TV-API-Gateway)
+[Frontend](https://github.com/fga-eps-mds/2023.2-UnB-TV-Frontend)
+
+## Acessando o repositório localmente
+
+### Requisitos
+
+-   docker e docker compose
+
+Primeiro passo é instalar o docker e docker compose, para isso siga os passos de instalação do [docker](https://docs.docker.com/engine/install/) e [docker compose](https://docs.docker.com/compose/install/).
+
+Execute o servidor local:
+
+```
+docker compose up
+```
+
+Acessar o localhost em: http://localhost:8001
+
+## Equipe
+
+|                                                              Foto                                                               |               Nome                |       Github       |             Email              | Matrícula |
+| :-----------------------------------------------------------------------------------------------------------------------------: | :-------------------------------: | :----------------: | :----------------------------: | :-------: |
+|    <img width="100px" style="border-radius:10%" src="https://github.com/DaviMarinho.png" alt="Davi Marinho da Silva Campos">    |   Davi Marinho da Silva Campos    |    @DaviMarinho    |   [email protected]    | 190026600 |
+| <img width="100px" style="border-radius:10%" src="https://github.com/Diego-Carlito.png" alt="Diego Carlito Rodrigues de Souza"> | Diego Carlito Rodrigues de Souza  |   @Diego-Carlito   |    <[email protected]>    | 221007690 |
+|      <img width="100px" style="border-radius:10%" src="https://github.com/eric-kingu.png" alt="Eric Akio Lages Nishimura">      |     Eric Akio Lages Nishimura     |    @eric-kingu     |    <[email protected]>    | 190105895 |
+|     <img width="100px" style="border-radius:10%" src="https://github.com/GabrielaTiago.png" alt="Gabriela Tiago de Araujo">     |     Gabriela Tiago de Araujo      |   @GabrielaTiago   |    <[email protected]>    | 190028475 |
+|   <img width="100px" style="border-radius:10%" src="https://github.com/Gabrielle-Ribeiro.png" alt="Gabrielle Ribeiro Gomes">    |      Gabrielle Ribeiro Gomes      | @Gabrielle-Ribeiro | [email protected] | 170011020 |
+|   <img width="100px" style="border-radius:10%" src="https://github.com/geraldovictor.png" alt="Geraldo Victor Alves Barbosa">   |   Geraldo Victor Alves Barbosa    |   @geraldovictor   |   [email protected]    | 170011119 |
+|   <img width="100px" style="border-radius:10%" src="https://github.com/cansancaojennifer.png" alt="Jennifer Costa Cansanção">   |     Jennifer Costa Cansanção      | @cansancaojennifer |    <[email protected]>    | 221007733 |
+|    <img width="100px" style="border-radius:10%" src="https://github.com/joao15victor08.png" alt="Jennifer Costa Cansanção">     |   João Victor de Oliveira Matos   |  @joao15victor08   |    [email protected]    | 170013987 |
+|         <img width="100px" style="border-radius:10%" src="https://github.com/nYCSTs.png" alt="Lucas da Cunha Andrade">          |      Lucas da Cunha Andrade       |      @nYCSTs       |  [email protected]   | 180105256 |
+| <img width="100px" style="border-radius:10%" src="https://github.com/Marcosatc147.png" alt="Marcos Antonio Teles de Castilhos"> | Marcos Antonio Teles de Castilhos |   @Marcosatc147    |    <[email protected]>    | 221008300 |
+|    <img width="100px" style="border-radius:10%" src="https://github.com/RaisSabeAndrade.png" alt="Raissa Andrade Silveira">     |      Raissa Andrade Silveira      |  @RaisSabeAndrade  |    <[email protected]>    | 221035077 |
+|   <img width="100px" style="border-radius:10%" src="https://github.com/castroricardo1.png" alt="Ricardo de Castro Loureiro">    |    Ricardo de Castro Loureiro     |  @castroricardo1   |  [email protected]   | 200043111 |
+|      <img width="100px" style="border-radius:10%" src="https://github.com/savioc2.png" alt="Ana Carolina Rodrigues Leite">      |      Sávio Cunha de Carvalho      |      @savioc2      |     [email protected]     | 180130889 |
+|       <img width="100px" style="border-radius:10%" src="https://github.com/vitoriaaquere.png" alt="Vitória Aquere Matos">       |       Vitória Aquere Matos        |   @vitoriaaquere   |    <[email protected]>    | 190096616 |