TestThomas
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/be/xplore/GameTest.java
changesTest

blalvalblala
Merge branch 'master' of https://github.com/GlennHue/test