fix merge conflicts
pulling in data on incentive policies
added bcrypt ruby
merge conflicts
login form