Finalizing partone
Merging
Merge branch 'master' of github.com:hue03/CS3243October

Conflicts:
	Project5/PartOne/out.txt