Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of https://github.com/chrismuccioli/singles-club into gh-pages

Conflicts:
	journal/daniel-bachman/index.html
Merge branch 'gh-pages' of github.com:chrismuccioli/singles-club into gh-pages

Conflicts:
	journal/daniel-bachman/index.html
Merge branch 'master' into gh-pages
Fixed footer grid