Collision
Merge branch 'master' of https://github.com/CHECAPCompSci/Assignments

Conflicts:
	NewFile