all
all misc
all
Merge branch 'master' of https://github.com/watermelonist/JavaLevel0

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/BicycleTutorial/.indexes/e4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/BicycleTutorial/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/BicycleTutorial/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/CardExercise/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/CardExercise/1.tree
	.metadata/.plugins/org.eclipse.core.resources/.projects/CardExercise/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/CreateObjectDemo/1.tree
	.metadata/.plugins/org.eclipse.core.resources/.projects/CreateObjectDemo/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/LocalClassExample/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/LocalClassExample/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/NumberHolder/1.tree
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.egit.core.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.egit.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
	.metadata/.plugins/org.eclipse.debug.core/.launches/DisplayDeck.launch
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.egit.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.jdt.core/1498219845.index
	.metadata/.plugins/org.eclipse.jdt.core/1995173708.index
	.metadata/.plugins/org.eclipse.jdt.core/305854171.index
	.metadata/.plugins/org.eclipse.jdt.core/30765161.index
	.metadata/.plugins/org.eclipse.jdt.core/3133528496.index
	.metadata/.plugins/org.eclipse.jdt.core/4155206848.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
	.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.editors/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml