conf.dir
Merge branch 'master' of https://github.com/mix1/tarkvaratehnika

Conflicts:
	src/ee/ut/math/tvt/dreamteam/Intro.java
	src/ee/ut/math/tvt/dreamteam/IntroUI.java