itemDTO etc
commit
Merge branch 'master' of https://github.com/Gabbe1993/Network_Programming_With_Java_Homework2

Conflicts:
	.idea/workspace.xml
itemDTO fix