teste
Merge branch 'master' of github.com:maryliag/hackathon-apis

Conflicts:
	app/views/layouts/application.html.erb
menu
Merge branch 'master' of github.com:maryliag/hackathon-apis
lalala