Implemented UI
Fixed conflicts

Conflicts:

MouseophonicServer/src/main/java/edu/chalmers/mouseophonic/desktop/Serve
rController.java
Conflict fixed