ch-changes.
ch-changes
Merge branch 'gh-pages' of https://github.com/oompt/blog into gh-pages

Conflicts:
	_posts/2014-06-12-hacker-marketing-part-two.md
	_site/atom.xml
	_site/page2/index.html
ch-changes