BS
Merge branch 'master' of https://github.com/wallflower1/JMI_Moodle-DBMS

Conflicts:
	template/teacher_books.php
Merge pull request #3 from sharanagrawal/master

minor correction