Update _config.yml
Update sidebar.html
Merge branch 'gh-pages'
Merge branch 'master' of https://github.com/jstart/jstart.github.io

Conflicts:
	_config.yml
	_includes/sidebar.html