added some rspec testing for models
Merge branch 'Kyle'

updating with new model migrations
sooooo many commmits