merged branch and now fixed db settings
Merge branch 'master' of github.com:shomanishikawa/joefresh into frontend