Updating the migrations...
Merge branch 'development' into jr/fix_migrations
Merging in development
Merge pull request #36 from ijustwanttocode/jr/fix_migrations

Fix migrations