Merge branch 'Aakash's-Branch' of https://github.com/STEM-HealthInformationManagement/Patient into Aakash's-Branch

Conflicts:
	.gitignore