Updates to new strategy, small changes to old.
Should all work.
Merge branch 'master' of ssh://github.com/RimasTr/sdp-group6

Conflicts:
	src/balle/strategy/Game2.java