netoyage repo / sons /
Merge branch 'master' of https://github.com/Hatscat/Insane_Behaviors_Tournament

Conflicts:
	public/js/hud.class.js