/update functional now. Needs to be cleaned up.
Merge branch 'master' of https://github.com/Platetonic/server