week 6 en beetje week7
6.30 en een beetje week7
merge conflict
Something somethin.... + 7.18
Something class files in src
Merge branch 'sophie' of https://github.com/Kurocon/softwaresystemen into sophie
Work on server/client
Again week8 + mandelpanel
Merge branch 'sophie' of https://github.com/Kurocon/softwaresystemen into sophie
Merge branch 'kevin' into sophie
GUI fixed && ...
GUI && ...
A load of server / client things. I should commit more.
Merge branch 'master' of https://github.com/Kurocon/softwaresystemen into kevin
Merge branch 'kevin'