missing slide
Merge branch 'master' of https://github.com/zachmorgan/Final-Project

Conflicts:
	cyoa/js/slides.js
	cyoa/slides/html/kc_forsyth_timeiscritical.html