Merge branch 'gh-pages'
refreshed and updated site
Merge branch 'master' into gh-pages

Conflicts:
	_config.yml