Update spaxw ! / update popUp !
Merge branch 'master' of https://github.com/Hatscat/Insane_Behaviors_Tournament

Conflicts:
	public/js/init.js