working track controller separation
working track controller separation
fixed commit
Merge branch 'master' of https://github.com/tnason/CoE1186

Conflicts:
	prototypes/TrackModel/TrackModel.java
Merge pull request #32 from cnd11/master

latested