Initial commit
Adding beginning sentence
Adding README.md
Update README.md
Jin adds his sentence.
stuart's addition
Hannes added a sentence
Noam's thing
conflict
Merge branch 'master' of https://github.com/tigenie/collaborative_writing

Conflicts:
	novel.txt
Merge branch 'master' of https://github.com/tigenie/collaborative_writing
new
Conflicts:
	novel.txt
test
Conflict Resolution
Merge https://github.com/tschannes/collaborative_writing
New line
anything
Merge branch 'master' of https://github.com/tigenie/collaborative_writing
messagei