Removed merge conflicts
Merge branch 'master' of https://github.com/Tadimsky/vooga

Conflicts:
	src/vooga/rts/map/GameMap.java