changed
Merge branch 'master' of https://github.com/dvn7035/TeamIceCreamProject

Conflicts:
	test.txt