phase VI
Merge branch 'master' of https://github.com/badmeangood/him

Conflicts:
	project_posts/2014-13-03-Phase-VI.md