iaaa
Merge branch 'mysql' of https://github.com/FloGou/judo into mysql

Conflicts:
	templates/Competition/combat.html