I think we should put all the changes we did for the live server and push it onto the master branch. Of course we'll need to keep the "$_SERVER['DOCUMENT_ROOT']."/clashofclans/" in the master branch files.
Yea we can work on that, but for now, new features gets implemented to master. In other words, pretend we never deployed the website and there was no deployment branch.
I think we should put all the changes we did for the live server and push it onto the master branch. Of course we'll need to keep the "$_SERVER['DOCUMENT_ROOT']."/clashofclans/" in the master branch files.