Initial commit
Merge branch 'master' of github.com:miafmira/booklist

Conflicts:
	app.js
	package.json