Merge pull request #4 from daverboy23/master

Stop enum changed name
moved source files into src dirctory in netbeans project
Merge remote-tracking branch 'upstream/master'

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