Trying Andrew Munsell's tutorial again...
Merge branch 'tutsplus'

Conflicts:
	_config.yml
	_site/index.html
ugh