Editing story
Merge branch 'master' of https://github.com/Ca2Patton/MyCPPAssigments into Storyline

Conflicts:
	story