Post
Merge branch 'master' of github.com:tylermolamphy/tylermolamphy.github.io

Conflicts:
	_posts/post/2014-02-14-now.md