Stuff
Merge branch 'master' of github.com:Assios/Ole

Conflicts:
	play.js