公司机子代码
Merge branch 'master' of
https://github.com/ChakhinHsui/throwable-new.git

Conflicts:
	throwable-new/src/main/java/throwable/server/bean/Answer.java
	throwable-new/src/main/java/throwable/server/bean/Question.java
	throwable-new/src/test/java/throwable/server/user/UserTest.java
继续添加question 和 kind