Adding in other variables
Merge branch 'master' of github.com:giv2giv/giv2giv-rails