final version of the coursework from fri 20th of Dec
GUI on the client side improved
Merge pull request #3 from Code-Crunch/marina

Merging branch marina into master, final GUI design