changing db settings
production db settings
Merge branch 'master' of github.com:mnfox/p4

rying to fix merge issue

trying to fix merge issue