ג
Merge branch 'master' of https://github.com/daniel-cambium/bookso

Conflicts:
	js/bookController.js
מחיקה
דגדג
כג
Merge branch 'master' of https://github.com/daniel-cambium/bookso

Conflicts:
	js/bookController.js
ע
Merge branch 'master' of https://github.com/daniel-cambium/bookso

Conflicts:
	js/bookController.js
עעגכ
Merge branch 'master' of https://github.com/daniel-cambium/bookso
path of the life
Merge branch 'master' of https://github.com/daniel-cambium/bookso