some cleanup
Merge remote-tracking branch 'origin/master'

Conflicts:
	flask_book/chapter_9/db.sqlite