hammertime
merge gemfile