Inital commit
Merge branch 'master' into gh-pages

Conflicts:
	js/main-page.js