Merge pull request #15 from LightGuard/master

Switching to Sinatra
Testing in place