Added file: book.asciidoc
Added file: book.asciidoc
Made changes to book.asciidoc
Added file: book.asciidoc
Made changes to book.asciidoc
Added file: foo.txt
Made changes to foo.txt
Merge branch 'master' of https://atlas-server.oreilly.com/git/1234000000850

Conflicts:
	book.asciidoc