Merge branch 'alex' of github.com:alexfaber2011/pharm into alex
Fix merge master..alex
Integrate papi and front end
Fix stuff
Remove shit