CHANGED TO JAVA 6 YOU BARBARIANS
asdfasdf

Conflicts:

workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.e
clipse.core.resources
	workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
Merge branch 'master' of https://github.com/DongyKong/TeamBokun
work?

Conflicts:
	workspace/.metadata/.log
	workspace/.metadata/.plugins/org.eclipse.core.resources/.history/b8/c0a76c0ebcc60013181fa6c101d00764
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/TeamBokun4Lyfe/.indexes/af/history.index
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/TeamBokun4Lyfe/.indexes/e4/55/history.index
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/TeamBokun4Lyfe/.markers
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/TeamBokun4Lyfe/.syncinfo.snap
	workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	workspace/.metadata/.plugins/org.eclipse.core.resources/.snap
	workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	workspace/.metadata/.plugins/org.eclipse.jdt.core/3335810878.index
	workspace/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	workspace/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	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.properties
	workspace/TeamBokun4Lyfe/.classpath
	workspace/TeamBokun4Lyfe/bin/jsonParse/CarJsonParser.class