taylor update
Merge branch 'master' of https://github.com/raksonibs/collaborative_writing

Conflicts:
	novel.txt
taytay update
taytay stop ripping me off