Merge pull request #8 from liugc/master

20:35
change the name of test.txt
Merge remote-tracking branch 'gcqc/master'
add and delete some files
modified the User.java
modified the data.yml
aa