Book 1 + 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	_data/books.yml