start jekyll blog
Merge remote-tracking branch 'origin/master'

Conflicts:
	_posts/2013-12-08-start-jekyll-blog.markdown