fixed error causing rails to crash
Merge pull request #82 from nathantross/error

fixed error causing rails to crash
Merge branch 'master' of https://github.com/nathantross/project2