Merge branch 'master' of https://github.com/dcac/dcac.github.io

Conflicts:
	_posts/features/2012-12-12-the-make-up-of-2012-pt-1.md
Replaced essay