Update to server
Merge branch 'master' of https://github.com/tsukolsky/ec440