changes to javascript
Merge branch 'dev' of github.com:csoalhat/washit