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

Conflicts:
	index.php
	login/index.html
4