commit inicial do projeto escola
Merge branch 'master' of https://github.com/jpsfmmb/app-ror

Conflicts:
	README.md