code more readable
Merge branch 'UIdone'

Conflicts:
	src/ee/ut/math/tvt/team1/Intro.java
	src/ee/ut/math/tvt/team1/IntroUI.java
	version.properties