mariano puto
Merge branch 'ceci' of github.com:CeciliaRodriguez/MySchool into ceci

Conflicts:
	db/MySchool
	db/schema.rb