C
nity checking
C
Merge branch 'beta_strategy' of https://github.com/stabradi/OOAD_strategy into beta_strategy

Conflicts:
	src/strategy/game/version/beta/BetaStrategyGameController.java
	test/strategy/game/version/beta/TODO