Updating files and stuff
Merge branch 'master' of https://github.com/IanLeeClark/CloudServer