about to commit
Merge branch 'master' of github.com:brownhci/TouchApp