made note that I am adding tokenable in another branch for now
added the database.yml.sample file
added rspec pride
resolved merge conflict