Settings class merge error
Merge branch 'master' of https://github.com/jackxl/MediCare
Reverted Changes on graph and Re-Enabled Graphs in GUI and Doctor Client
Merge branch 'master' of https://github.com/jackxl/MediCare