Merge branch 'master' of https://github.com/SoftJot/CPSC101TermProject

Conflicts:
	.gitignore
Update
Merge branch 'master' of https://github.com/SoftJot/CPSC101TermProject