added resolve to patient state
merging

Merge branch 'master' of https://github.com/zirbem07/alpha