foo
Boohoo hahah

Merge branch 'master' of https://github.com/Ca2Patton/MyCPPAssigments

Conflicts:
	story