modified:   package.json
Merge branch 'master' of https://github.com/yoggy/image_server