test.js from branch coffee
package.json from branch coffee
Merge branch 'master' into coffee