...
Merge branch 'master' of https://github.com/Ca2Patton/MyCPPAssigments
Stop inputting nonsense
Conflicts:
	story