Server can now recieve and respond messages
Merge remote-tracking branch 'origin/master'