Signed-off-by: ElianeMargarida <eliane.margarida@gmail.com>
Signed-off-by: ElianeMargarida <eliane.margarida@gmail.com>
Signed-off-by: Eliane Margarida <eliane.margarida@gmail.com>
Merge branch 'master' into Eliane-Margarida-S.-O.-Ramos
Merge branch 'master' into Eliane-Margarida-S.-O.-Ramos
Merge branch 'Eliane-Margarida-S.-O.-Ramos' into Entrega1
Merge branch 'master' into Eliane-Margarida-S.-O.-Ramos

Signed-off-by: Eliane Margarida <eliane.margarida@gmail.com>
Signed-off-by: Eliane Margarida <eliane.margarida@gmail.com>
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