Yoldo baggins
no idea how to ant
no idea how to ant
Homework 3
Homework 4 before task 1.
Added lots of files and made this thing work.
 ${message}
 ${message}
 ${message}
 ${message}
Merge branch 'master2'

Conflicts:
	POS/.classpath
	POS/Intro.log
	POS/application.properties
	POS/build.xml
	POS/src/ee/ut/math/tvt/vapradjailusad/Intro.java
	POS/src/ee/ut/math/tvt/vapradjailusad/IntroUI.java
	POS/version.properties
Merge branch 'master' of https://github.com/AndreasGP/BestPOS.git