gfffds
Changed the code so it works for grant
Merge branch 'master' of https://github.com/granttimmerman/Narrative

Conflicts:
	app.js