merge
Merge branch 'master' of https://github.com/Ducaluk/shapeGame

Conflicts:
	js/classes/Player.js