Merge branch 'boilerplate' into gh-pages

Conflicts:
	_config.yml
	_layouts/main.html
	index.md