M
Merge branch 'master' of https://github.com/mackeyzheng/bookworm

Conflicts:
	assets/index.html
	assets/js/list_template.js