Commit 1.
Merge branch 'master' of https://github.com/sravich/SoftwareDesign_Group35