env set up
modeling, migration & seeding
dev
dev
Merge branch 'dev-master'