doing shit
Merge branch 'feature-encounterView' of https://github.com/kevinzurek/femr into feature-encounterView