Fixed folders
moving stuff
Merge pull request #30 from duffbuster/colin_server.py

Colin server.py