Merge branch 'gh-pages'
Alignment corrections

Feed Div's fixed to correctly sit next to one another.
Merge branch 'gh-pages'

Conflicts:
	css/styles.css
	index.html
Merge branch 'gh-pages'

Conflicts:
	css/styles.css
	index.html
Updated styling and extra links
Merge branch 'master' into gh-pages