blank jekyll
blank slate
important stuff
changed defaults
changed defaults
important stuff
line endings, bad merge
Merge commit '10832f7'

Conflicts:
	_config.yml
	_posts/2013-07-16-welcome-to-jekyll.markdown