individual deliverable stuff
Merge pull request #28 from jamesclampffer/master

fixed up some track model stuff
Update Environment.java
fixed commit
Merge branch 'master' of https://github.com/tnason/CoE1186

Conflicts:
	prototypes/TrackModel/TrackModel.java