second commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	_config.yml
	_posts/2014-09-02-welcome-to-jekyll.markdown