New
Merge branch 'master' of https://github.com/umelec/TournamentCasa

Conflicts:
	TournamentCasa.js