collision fix
Merge branch 'master' of https://github.com/jeffs5/WerewolfTag

Conflicts:
	base/Globals.py