update
Merge branch 'hackweek' of github.com:rfaugeroux/jack into hackweek