Commit partial changes before updating with formatting changes
Merge branch 'master' of https://github.com/OwenNash/TaxE

Conflicts:
	core/src/com/taxe/game/GameCore.java
	core/src/com/taxe/game/Track.java
The drawing of track added with some refactoring done.