Merge pull request #1 from zirbem07/sean

this is a test comment
added resolve to patient state
merging

Merge branch 'master' of https://github.com/zirbem07/alpha
seans commit
Patient side commit
commiting merge
fixed no completed exercise bug
Commit before pulling max's excercide bug
Merge branch 'master' of http://github.com/zirbem07/alpha into sean