Version 0.1
a
Merge remote-tracking branch 'origin/master'

Conflicts:
	_config.yml
	_data/authors.yml
	_data/navigation.yml
	_posts/blog/2014-08-08-hello-world.md
	images/site-logo.png
	index.html