a
Merge branch 'master' of github.com:thalessr/collaborative_writing
adsda
a
a
Merge remote-tracking branch 'origin/master'

Conflicts:
	novel.txt