commit
Merge branch 'master' of https://github.com/johnljoterud/d-kstudiegruppe

Conflicts:
	TCP/src/Logic/Logic.java