Code-Crunch/CM3033-final — pull request #3 by marinamarina (2013-12-21 22:01:45+00:00)
Title: Merging branch marina into master, final GUI design

GUI design on the server side slightly improved