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