update gemfile lock for deployment
fixed mailer views
Merge branch 'master' of github.com:kateflood/garden-exchange
fix gemfile merge conflicts
hide remove button on new, minot fixes to image selection