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

Conflicts:
	index.php
ש
ש
ש
ש
ש
ש
Merge branch 'master' of https://github.com/daniel-cambium/bookso
Merge branch 'master' of https://github.com/daniel-cambium/bookso
ש