Graphical stuff
Merge branch 'master' of https://github.com/turos/Masturbatrix

Conflicts:
	index.html