btn login width and float
Merge remote branch 'heroku/master'

Conflicts:
	app/assets/stylesheets/application.css.scss
footer span all
footer span all, add border top
Merge remote branch 'heroku/master'