Commit 001
Merge branch 'master' of github.com:DomingosDuarte/Aplicacao

Conflicts:
	.gitignore
Commit 003