Update Gemfile.lock
Specify JS and CSS compressors
updated database seeds
updated the database
updated the tests
merged dev
made it so test don't break