some problems with my sourcetree
Merge branch 'homework_3' of https://github.com/PirnPurgis/KIKA into homework_3

Conflicts:
	src/ee/ut/math/tvt/kika/IntroUI.java