forcing me to re-commit these controllers
Merge branch 'master' of github.com:firerml/strange_encounters_app
RSpecs, but it some of the tests wont pass until I have an updated database version
went over the controller/model/spec with Mike and made a few edits
Merge pull request #6 from firerml/rspecs

Rspecs
rspecs for models are all passing
made friendship_database
removed an extra line
updated seed files to have friendships
Merge pull request #8 from firerml/friendship_database

Friendship database
Merge pull request #9 from firerml/rspecs

 Rspecs
wiped the pain-in-the-ass log