more work
Merge branch 'master' of https://github.com/susfe-apple/coffeehouse_files