Remove GameLib and move collision method to GameObject
Merge branch 'master' of github.com:albinodervall/RTS

Conflicts:
	src/game/GameState.java