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

Conflicts:
	coverage/.last_run.json
	coverage/.resultset.json
	coverage/index.html
add cucumber file
add cucumber file...
resolve conflict...