no idea what changed
Merge branch 'master' of https://github.com/bsansouci/wearhacks2014
Merge branch 'master' of https://github.com/bsansouci/wearhacks2014
adding a lot of stuff