changes w chuck
Merge branch 'master' of github.com:tjlane/trapdoor