fist working version
merged package.json
Merge branch 'master' of github.com:plasticpanda/whale