init commit
Here's a commit message.
e Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/emstans/octopress

Conflicts:
	source/_posts/2014-04-15-this-is-the-first-post.markdown