Call me pedantic but...
Merge branch 'master' of https://github.com/cmpt371Group1/Patient-Life-Simulator