After forking project with Alex
Incremental commit
Internal content
Merge remote-tracking branch 'summerton/master'

Conflicts:
	css/html-reset.css
	css/styles.css
	sass.bak/_gwwc3.scss
	sass/_gwwc3.scss
	sass/_init.scss
	sass/components/_misc.scss
	sass/components/footer.scss
	sass/styles.scss
	templates/page.tpl.php