com acentuacao
Merge branch 'master' of https://github.com/LucasMarlon/si1-lab1

Conflicts:
	README.txt
Diretório estatica-simples adicionado