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

Conflicts:
	css/StyleSheet.css
	css/ltr.css
	index.php