add upload
Merge branch 'master' into server_api
Merge pull request #2 from wesgt/server_api

Server api