Merge branch 'master' of bitbucket.org:klanoma/williamyoumans-forkcms
removed advertisement block
stripped out old formatting
moved main navigation to the header include
header and footer formatting
compass compile
removed duplicate navigation
added template footer and footer
began scssifying template styles
updated font-awesome
started homepage integration
integrate home blocks correctly
replaced placeholder homeslider image
template updates
updated default positions
moved more of the homepage to the CMS
added cms blocks to the footer
added html structure to generic template
footer updates
added subtitle section