merge conflicts fixed in gemfile and calculation.rb file
Merge branch 'master' of https://github.com/Bharatupgraded/pillphone