Muudame
Merge branch 'master' of https://github.com/priitd/KOMP

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/KOMP/.indexes/e4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/KOMP/.markers
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/1.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.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.ide.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/581869738.index
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.recommenders.completion.rcp.calls/call-models-0.5.json
	.metadata/.plugins/org.eclipse.recommenders.rcp/v0.5-package-root-infos.json
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
MUUDAME 2
Merge branch 'master' of https://github.com/priitd/KOMP

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/KOMP/.indexes/e4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.jdt.core/581869738.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	KOMP/bin/Peaklass.class
	KOMP/src/Peaklass.java