Updates to Zachs js files
Merge branch 'master' of https://github.com/zachmorgan/Final-Project

Conflicts:
	cyoa.v11.suo
	cyoa/bin/cyoa.dll
	cyoa/bin/cyoa.pdb
	cyoa/cyoa.csproj
	cyoa/js/slides.js
	cyoa/obj/Debug/cyoa.csproj.FileListAbsolute.txt
	cyoa/obj/Debug/cyoa.csprojResolveAssemblyReference.cache
	cyoa/obj/Debug/cyoa.dll
	cyoa/obj/Debug/cyoa.pdb