Added new capfile
Updated db file
Updated gemfile
merge