constraints !!
Merge branch 'master' of https://github.com/Hatscat/Insane_Behaviors_Tournament

Conflicts:
	public/js/player.class.js
Merge branch 'master' of https://github.com/Hatscat/Insane_Behaviors_Tournament