Added budget calculations
Fixed gemfile conflict