Merged sinatra skeleton to current codebase
Renamed spec and model files
Added require spec_helper to file
Fixed merge conflicts