A load of server / client things. I should commit more.
Merge branch 'master' of https://github.com/Kurocon/softwaresystemen into kevin
Merge branch 'kevin'