buggy save
conflicts fixed
Merge branch 'master' of https://github.com/sydneyli/PredAI

Conflicts:
	game.py