Migrations and stuff
Merge branch 'master' of https://github.com/elliotanderson13/booksmart1