prep for heroku
trying again
merged gemfile conflict
Merge branch 'develope' of github.com:maneeshnycda/fantasui into develope
merge gemfile