Have fun with this commit yes.. yes,,
Merge branch 'master' of https://github.com/kvendrik/mdown-to-book

Conflicts:
	mdown/template/book/css/main.css.map