Alterações do projeto da marina
Merge branch 'master' of https://github.com/diegogoncalves/PFC

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes/com/example/pfc/Screen4$1.class
	bin/classes/com/example/pfc/Screen4.class
	res/layout/activity_main.xml