Begun work on the XMLSerializer
extra
Merge branch 'master' of https://github.com/Isnah/Gruppe39

Conflicts:
	MyWeekClient/.classpath
	MyWeekServer/bin/model/Room.class
Hopefully this works