Adding what we currently have on the server to git.
Fucking merge