fix everything i broke
no idea
Delete Procfile
phonegap added
phonegap
figuring out git:
fixed dependencies
fixed app.js
fixed conflicts
Merge branch 'katherine'
quick test for server
server