Merge branch 'master' of https://github.com/serprex/openEtG-vanilla

Conflicts:
	tournament.htm
Merge branch 'master' of https://github.com/serprex/openEtG-vanilla
changed deck code default