updates
Merge branch 'master' of https://github.com/ChristianAuner/Prog2.git

Conflicts:
	Prog2/src/Test.java