ergreg
Merge branch 'master' of https://github.com/furjat/altkom.git

Conflicts:
	src/pl/altkom/Start.java