q
no message
Merge branch 'master' of https://github.com/priitd/KOMP

Conflicts:
	KOMP/src/oliver_peaklass.java