Merge pull request #2 from rupertjeff/master

Merge in new content
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
Merge branch 'new-web-layout' of https://github.com/rupertjeff/annie-site into new-web-layout
Styling updates for new layout.
Merge pull request #3 from rupertjeff/new-web-layout

Updates to Web layout
Finished css layout for new web layout.
Merge pull request #2 from misayi/new-web-layout

Finished new web layout updates.