book show
Merge branch 'master' of https://github.com/daniel-cambium/bookso
shelf edit
Merge branch 'master' of https://github.com/daniel-cambium/bookso

Conflicts:
	js/stackviewController.js
shelf view