Fixed bug when server throws IOException when client times out with a simulation request. Fixes #58
Merge branch 'master' of ssh://github.com/Fingerpaint/project-code