Minor changes
Merge branch 'master' of https://github.com/JordiAranda/bcn-htr-server
Finishing communication protocol
Solving merge issues