update
Merge branch 'gh-pages' of https://github.com/HughMushan/hugh_blog into gh-pages

Conflicts:
	_posts/2014-07-02-July.md