gemfile.lock before merging
Merge branch 'master' of github.com:pam-/mappetizer
added mail gem