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
Merge branch 'master' into UIdone
Merge branch 'UIdone'
.
Merge branch 'master' of https://github.com/RTougjas/Team1

Conflicts:
	.gitignore