Updated repo with current server files
Merge branch 'master' of https://github.com/sociallyoutward/Up-to-date-server-version