Website and Database up and running
Hopefully removed merge conflicts