Revert "Signed-off-by: ElianeMargarida <seu_email@email.com>"

This reverts commit 04875d0d3d0a9a918e22dc13b0522b99aa7ebfa5.
Revert "Revert "Signed-off-by: ElianeMargarida <seu_email@email.com>""

This reverts commit 4e3b66223a91f6dc8ca7ba16aa21130fb5cb9a9d.
Merge branch 'Entrega1' into Eliane-Margarida-S.-O.-Ramos
Merge pull request #1 from ElianeMargarida/Eliane-Margarida-S.-O.-Ramos

Eliane margarida s. o. ramos
Signed-off-by: Eliane Margarida <eliane.margarida@gmail.com>
Merge pull request #2 from ElianeMargarida/Eliane-Margarida-S.-O.-Ramos

Merge branch 'Entrega1' into Eliane-Margarida-S.-O.-Ramos
Merge branch 'Eliane-Margarida-S.-O.-Ramos'

Conflicts:
	Entrega 1
	Entrega 2/PortalCopa.zip
	Entrega 2/diagramas 2 entrega.pdf
	Plano de GestÃ£o de ConfiguraÃ§Ã£o/PLANO DE CONFIGURAÃ‡ÃƒO-Portal Copa do Mundo â€“ Brasil 2014.doc
Signed-off-by: Eliane Margarida <eliane.margarida@gmail.com>
Merge pull request #3 from ElianeMargarida/ElianeMargaridaS.O.Ramos

Eliane margarida s.o.ramos
Entrega 1

Signed-off-by: Eliane Margarida <eliane.margarida@gmail.com>
Plano de Testes
Merge pull request #4 from ElianeMargarida/ElianeMargaridaS.O.Ramos

Eliane margarida s.o.ramos
Merge pull request #5 from ElianeMargarida/master

PullRequest
Merge pull request #6 from ElianeMargarida/ElianeMargaridaS.O.Ramos

Merge pull request #5 from ElianeMargarida/master
Merge pull request #7 from ElianeMargarida/master

teste