Melhoria no layout
Melhoria no layout
Merge branch 'master2' of https://github.com/Mikaele/bdii into master2

Conflicts:
	salao/app/views/layouts/application.html.erb