nginx.conf and my.cnf changed
Merge branch 'master' of github.com:junedmunshi/SampleCode