testing stuff
test
Merge branch 'master' of https://github.com/hariv1505/se3011_proj

Conflicts:
	.DS_Store
	newEntries.csv