Jason's addition
Merge branch 'master' of https://github.com/atabas/collaborative_writing

Conflicts:
	novel.txt