style fixes
Merge branch 'master' of github.com:vincentt143/fanfour

Conflicts:
	app/assets/stylesheets/pages.css.scss
	app/views/pages/index.html.erb