initial
GA
Merge branch 'master' into gh-pages

Conflicts:
	css/main.css
	index.html
	js/main.js
stupid
Merge branch 'master' into gh-pages
fixes+ download