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

Conflicts:
	src/Base/Card.py
Merge branch 'CleanUp' of https://github.com/timidger/Mao into CleanUp