l
Merge branch 'gh-pages' of https://github.com/PHironaka/Hammy into gh-pages

Conflicts:
	_posts/2014-09-04-cali.markdown