Other changes
Merge branch 'master' of https://github.com/lyra833/stufts

Conflicts:
	Computer Science/Assignments/hw5/sort3
	Computer Science/Assignments/hw5/sort3.cpp