Commit before removing node modules
Removing node_modules from git history
Merge branch 'master' of github.com:alexfaber2011/pharm
began creating front-end
Merge branch 'alex' of github.com:alexfaber2011/pharm into alex
Merge branch 'alex'