First commit after PAPI implementation
Fixed merge conflicts (alex)
Merge branch 'master' of github.com:alexfaber2011/pharm
Small front-end changes
Merge branch 'master' of github.com:alexfaber2011/pharm
Merge branch 'master' of github.com:alexfaber2011/pharm
Front end 'nearly' complete