add shotgun to gemfile
fix the ppl on master
Resolving merge conflict.