README.txt
comentando os ignorados
commit app
Merge branch 'master' of https://github.com/rafabrun2006/sosmalas

Conflicts:
	.gitignore
	public/.htaccess