finished game
Merge branch 'master' into newphilicia

Conflicts:
	controller.py
	model.py
	view.py