testing progress
Merge branch 'master' of https://github.com/cmpt371Group1/Patient-Life-Simulator

merging because of reasons
added tests