added the thing
Merge branch 'gamma_strategy' of https://github.com/stabradi/OOAD_strategy into gamma_strategy

Conflicts:
	src/strategy/game/StrategyGameFactory.java
	src/strategy/game/version/UniversalStrategyGameController.java
	test/strategy/game/version/epsilon/EpsilonStrategyMainTest.java
butts