delete
finalization
Merge pull request #44 from duffbuster/colin_server

Colin server