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

Conflicts:
	coverage/.last_run.json
	coverage/.resultset.json
	coverage/index.html
	db/development.sqlite3
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

Conflicts:
	coverage/.resultset.json
	coverage/index.html
fix rspec