Index blaah
Merge branch 'master' of https://github.com/turos/Masturbatrix

Conflicts:
	index.html
	js/datafiles/datatest.js
Merge branch 'master' of https://github.com/turos/Masturbatrix