Kaori's accept file updated
Merge branch 'master' of github.com:zachmorgan/Final-Project

Conflicts:
	cyoa.v11.suo
	cyoa/bin/cyoa.dll
	cyoa/js/slides.js
	cyoa/obj/Debug/cyoa.dll
Removed files that don't need to be in the repository