Repo is re-factored for a server_master branch to clone from when deploying the server

This will be the master branch for the server