some fixes
fixing merge conflict
fix
another merge fix
merge fix
Update model.md
Create plan_of_care.md
Update model.md
fix for demographics returning array from dre
Merge pull request #33 from kwyoung11/master

Required fixes for ccda-generator export functionality
logging for blue button
Merge pull request #35 from amida-tech/bb-logging

logging for blue button
v1.0.3
Merge branch 'master' of https://github.com/amida-tech/blue-button
Merge branch 'master' of https://github.com/amida-tech/blue-button into 1.1.0-beta