Merge pull request #6 from mwhittaker/server-cleanup

Cleaned up `server.rs`.
Merge pull request #7 from mwhittaker/client

Implemented client.
Merge branch 'master' into network