basically working
deleted stuff
Merge branch 'master' of https://github.com/jkuk/cargame

Conflicts:
	Code/cargame/src/cargame/Car.java
	Code/cargame/src/cargame/Track.java