added book scaffold
added movies scaffold
Merge branch 'master' into connor
More migrations
generated post scaffold
did a db migration
generated friend request scaffold
Generated user info scaffold
Migration
Editing Gemfile in an attempt to create a conflict
cause conflict
I don't know what just happened