.
Merge branch 'gh-pages' of https://github.com/tararoys/cats-teach-code into gh-pages

Conflicts:
	_posts/2014-06-09-new.md