Minor style update.
Merge branch 'master' of https://github.com/rupertjeff/annie-site

Conflicts:
	public/css/main.css
	scss/main.scss
Merge branch 'master' of github.com:misayi/annie-site