Mixed Roel's protocol code with my GUI code
Merge branch 'master' of https://github.com/Fingerpaint/project-code