Merge branch 'master' into gh-pages

Conflicts:
	css/main.css
	index.html
	main.js