gameview
Merge branch 'master' of https://github.com/jcze91/ChifoumiSpoke

Conflicts:
	Shifumi/src/main/java/com/mti/GameView.java