Noam's thing
Merge branch 'master' of https://github.com/tigenie/collaborative_writing

Conflicts:
	novel.txt