initial commit
generated stuff with express
modules folder
fixed merge conflicts (alex)
callback function working
economic.js done
fix pull conflict
Merge branch 'alex' of github.com:alexfaber2011/pharm into alex
fixed package.json
Front end additions
Merge branch 'alex' of github.com:alexfaber2011/pharm into alex
Fix merge master..alex