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