Arquivos de configuração
Merge branch 'master' of https://github.com/Beltzac/Naotebuk.git

Conflicts:
	.project