Added code to communicate with server
Merge remote-tracking branch 'origin'