UML diagram
Merge pull request #1 from daverboy23/master

blahblahb
Stop enum
Merge pull request #2 from daverboy23/master

Stop enum class added
added code folder
added code folder
What I have of the Car class so far

Basic framework for now, let me know if you see anything that needs to
be added or changed.
Merge pull request #3 from daverboy23/master

David created car object base file and Julian added stops as an enumerated class
created a netbeans project with the files plus a track class
removed track.java
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
updated Stop enum
Merge pull request #4 from daverboy23/master

Stop enum changed name
moved source files into src dirctory in netbeans project
car.java
moved files
Merge branch 'master' of https://github.com/daverboy23/cargame into daverboy23-master

Conflicts:
	Code/cargame/src/cargame/Car.java
fixed files
edited car.java file a bit