Last commit was a mistake
Merge branch 'master' of https://github.com/ebookr/ebookr

Conflicts:
	package.json