final update? again?
Merge branch 'master' of https://github.com/markjgardner/HumDesignJam062014
ok