fixed stuff
Merge branch 'master' of github.com:bsansouci/wearhacks2014