bring backend up to date
Merge branch 'master' of github.com:joeandrews/washio-project