update qq
update
Merge branch 'master' of https://github.com/CrossLee/blog

Conflicts:
	WebContent/index.jsp
fix conflict