Teste 2
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
Merge branch 'master' of
https://github.com/Davidepaalte/ComputacaoMovel.git

Conflicts:
	ComputacaoMovel.SpaceShip/src/com/example/computacaomovel/spaceship/MainActivity.java