ok
g
add book info
book repository
book service
gg
ok
over
gg
Merge branch 'master' of https://github.com/JordanQiu/warship

Conflicts:
	pom.xml
	warship-common/target/surefire-reports/TEST-org.warship.common.AppTest.xml
	warship-common/target/surefire-reports/org.warship.common.AppTest.txt
	warship-repository/target/surefire-reports/TEST-org.warship.repository.AppTest.xml
	warship-repository/target/surefire-reports/org.warship.repository.AppTest.txt
	warship-rest/src/main/java/org/sevenup/rest/controller/InitializeController.java
	warship-rest/target/classes/org/sevenup/rest/controller/InitializeController.class
	warship-rest/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
	warship-rest/target/surefire-reports/TEST-org.warship.rest.AppTest.xml
	warship-rest/target/surefire-reports/org.warship.rest.AppTest.txt
	warship-server/src/main/java/org/sevenup/configuration/WebMvcConfiguration.java
	warship-service/target/surefire-reports/TEST-org.warship.service.AppTest.xml
	warship-service/target/surefire-reports/org.warship.service.AppTest.txt
ok
ok
ok
Merge branch 'JordanQiu-master'
ok