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

Conflicts:
	css/StyleSheet1.css
	js/homeController.js
Merge branch 'master' of https://github.com/daniel-cambium/bookso
מחיקה
Merge branch 'master' of https://github.com/daniel-cambium/bookso

Conflicts:
	js/navigationController.js
כ
Merge branch 'master' of https://github.com/daniel-cambium/bookso
לילח