conf chnages
Merge branch 'master' of github.com:vparihar01/Admin-Dashboard