rspec testing
Merge branch 'master' of https://github.com/Philhawk/desker
adding model
merge
testing testing testing
merge issues