Update index.html main.js stylesheet.css
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	index.html
	javascripts/main.js