Merge branch 'CleanUp' of https://github.com/timidger/Mao into CleanUp

Conflicts:
	src/Base/Card.py
Player.py had a general cleanup, moved some of the methods into magic methods and added tests to things
Merge branch 'CleanUp' of https://github.com/timidger/Mao into CleanUp

Conflicts:
	src/Base/Card.py