Test commit
add 1
Merge remote-tracking branch 'origin/bugFix'

Conflicts:
	src/pl/altkom/start/Start.java