bug fixes
Merge branch 'master' of https://github.com/rutchkiwi/tournafaux

Conflicts:
	tournafaux.js