Necessita comentar o cabecalho
Merge branch 'master' of github.com:LeAlbus/Navinha

Conflicts:
	aula1SDL.layout