Sajini feature new#6

SajiniWeerasinghe wants to merge 4 commits intomainZNilakshi/Capstone-Project:mainfrom

sajini-feature-newZNilakshi/Capstone-Project:sajini-feature-newCopy head branch name to clipboard