Changed from Git Gui

Signed-off-by: supraja-raghavan <supraja.raghavan@gmail.com>
Merge branch 'master' of https://github.com/Supraja-Raghavan/ASE-Group-project.git

Conflicts:
	test.txt
Merge branch 'master' of https://github.com/Supraja-Raghavan/ASE-Group-project.git

Conflicts:
	test.txt
Changed from Git Gui

Signed-off-by: supraja-raghavan <supraja.raghavan@gmail.com>