added a bunch of tests to bring up coverage, also added combat function
Merge branch 'beta_strategy' of https://github.com/stabradi/OOAD_strategy into beta_strategy

Conflicts:
	test/strategy/game/version/beta/BetaStrategyMainTest.java