Merge pull request #25 from jaypoulz/jpTwiddleThumbs

Fixed some bugs
Fixed AI integration
Merge branch 'master' of https://github.com/jaypoulz/Galamax

Conflicts:
	game.py
	qlearning.py
Revert "Merge branch 'master' of https://github.com/jaypoulz/Galamax"

This reverts commit 077d182702d301c7a5a4e6c8294f6c4c98f37b8b, reversing
changes made to f9a1266f06be4d432ba657ce4f1ee842049195bd.
Revert a6c4366..ee95195

This rolls back to commit a6c43669457077207c97a772579e29e0954829c0.
Merge branch 'master' into max4

Conflicts:
	galamax.py
	game.py
	qlearning.py