postt
Merge branch 'master' of github.com:joaquinlom/project_teachers

Conflicts:
	app/models/user.rb
	app/views/layouts/application.html.erb
	db/schema.rb