Nate's Commit

This project is making me fail my commitments... guess you can only
commit to one thing at a time...see what I did there?
Merge branch 'master' of https://github.com/ZacharyHebert/CYOASchoolProject

Conflicts:
	CYOA/CYOA/main.cpp
Okay maybe I fixed it