2C
Merge pull request #7 from HollyDAI/holly

Holly
test
Merge remote-tracking branch 'origin/master' into 2C

Conflicts:
	hello.txt
Merge pull request #8 from HollyDAI/2C

2 c
UI
Merge pull request #9 from HollyDAI/2C

UI
upload page
The JSP PAGE upload
Merge pull request #10 from HollyDAI/2C

2 c
Merge pull request #11 from HollyDAI/master

merge