map GUI
Merge branch 'master' of https://github.com/DongyKong/TeamBokun

Conflicts:
	workspace/.metadata/.log
	workspace/.metadata/.plugins/org.eclipse.cdt.core/.log

workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/TeamBo
kun4Lyfe/.markers

workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.e
clipse.core.resources
	workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi

workspace/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps

workspace/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers
.dat
	workspace/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml

workspace/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.pro
perties
	workspace/TeamBokun4Lyfe/bin/data/Car.class
	workspace/TeamBokun4Lyfe/bin/data/Freeway.class
	workspace/TeamBokun4Lyfe/bin/data/RoadSegment.class
	workspace/TeamBokun4Lyfe/bin/jsonParse/CarDeserializer.class
	workspace/TeamBokun4Lyfe/bin/jsonParse/CarJsonParser.class
	workspace/TeamBokun4Lyfe/bin/mySQL/MySQLConnect.class