added model user to factory for truck
got rid of drop_table migration that was screwing everything up
change bootstrap theme
Merge branch 'develop' of https://github.com/soolaimon/mobile_noms into develop
added carrierwave and rmagick gems. added imageuploader class. still needs configuring after views are added
add searchkick gem
add searchkick to truck model
fixed stupid 'ffaker' typo in gemfile
added line to test.rb for mailers to stop devise conflicts with testing
fix merge conflict
Fix merge conflict
Add a test for Elasticsearch
set and configure elasticsearch and searchkick
Merge branch 'search' into develop
Trying to get rid of business model. Messed up last time