http-proxy in the readme
Merge branch 'master' of github.com:oren/weighmyplate