java tutorial
Merge branch 'master' of https://github.com/vanryuji/ahope

Conflicts:
	workspace/.metadata/.log

workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/java-t
utorial/.markers

workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/java-t
utorial/org.eclipse.jdt.core/state.dat

workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/p
roperties.index
	workspace/.metadata/.plugins/org.eclipse.core.resources/.root/8.tree

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

workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.andr
oid.ide.eclipse.adt.prefs

workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.ecli
pse.jdt.core.prefs

workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.ecli
pse.jdt.launching.prefs

workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.ecli
pse.jdt.ui.prefs

workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.ecli
pse.ui.ide.prefs
	workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	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.launching/.install.xml
	workspace/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
	workspace/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml

workspace/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xm
l
	workspace/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml