db and rspec files, hopefully it will not break things
Merge pull request #9 from Psylynce/Justin_Work

db and rspec files, hopefully it will not break things