Added basic Pharmacy layout
Merge pull request #29 from kevinzurek/feature-triage

Feature triage
Merged pharm page
Added to pharmacy layout
Merge pull request #32 from DPalombo/pharmacy-layout

Added to pharmacy layout
Merge branch 'feature-triage' of https://github.com/kevinzurek/femr into kevinzurek-feature-triage
Merge branch 'master' of github.com:delasteve/femr
Merge pull request #34 from kevinzurek/feature-triage

Feature triage
fixed conflicts
Merge branch 'master' of github.com:delasteve/femr
Initial Medical Page
Updated Controllers to allow for sessions
Added tests
Added tests
added getID for current user
added pharmacy button in navigation
authenticate user on triage page
added search controller
fixed some css issues
clean up and track user on show page