package json change
package json merge
Merge branch 'master' into jackie
jackie
Merge branch 'master' into jackie
app.js
user.js
user.js
merge with master
index jade
jawbone
cleaned up