resolve conflict
resolve conflict
resolve conflict
remove coverage report
Merge branch 'master' of github.com:Trece/BookManage

Conflicts:
	coverage/.last_run.json
	coverage/.resultset.json
	coverage/index.html
Merge branch 'master' of github.com:Trece/BookManage
Merge branch 'master' of github.com:Trece/BookManage

Conflicts:
	coverage/.last_run.json
	coverage/.resultset.json
	coverage/index.html
Only admin can see Borrow/Return button