stest
Merge branch 'master' of ssh://git@github.com/jackyjackson/SINT.git

Conflicts:
	src/Autoverleih/Server.java