layout
Merge branch 'master' of https://github.com/Mikaele/HomeBanking

Conflicts:
	app/views/conta/index.html.erb
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
melhoria layout