alguma coisa

alguma oia
Merge branch 'master' of https://github.com/hiperativo/eventoscte

Conflicts:
	app/controllers/enrollments_controller.rb