changed pharmacy layout
Added basic Pharmacy layout
save encounters
missing commits from last commit
Modified pharmacy layout and added 10.sql
added pharmacies controller
fixed issues from pull
davids changes
Merge branch 'feature-triage' of git://github.com/kevinzurek/femr into pharmacy-layout
get patient for medical page
medical view
merging with kevins fork
auto populate medical page
Merge pull request #37 from DPalombo/pharmacy-layout

populating medical page
Added Ad Hoc Documentation
Merge pull request #38 from DavidWeisberg/master

Added Ad Hoc Documentation
added documentation related to class
Merge pull request #39 from kevinzurek/feature-triage

added documentation related to class
added the fEMR workflow diagram
Merge pull request #40 from kevinzurek/feature-triage

added the fEMR workflow diagram