Merged
Merge branch 'master' of github.com:schiem/ai_project

Conflicts:
	player.moves