finished up server.py
Merge pull request #43 from duffbuster/colin_server

finished up server.py