jejej
Merge branch 'master' of https://github.com/kertp/KAMM

Conflicts:
	.classpath