somemorejexample stuff
Merge origin/master

Conflicts:
	astroids2/src/test/java/edu/rug/gogp/game/connection/ClientControllerTest.java

resolved bug with beforeclass and jexample