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

Conflicts:
	Model.py
	Player.py
	Trap.py
	client.py
	server.py