Merge pull request #78 from oharaandrew314/#65-robust-server

#65 #67 Make server more robust and improve client-server interaction
Merge remote-tracking branch 'origin/dev' into #69-playable-client