conflict
Merge branch 'master' of https://github.com/tigenie/collaborative_writing
new
Conflicts:
	novel.txt
test
Conflict Resolution