commit all
Merge branch 'master' of github.com:xiaowoniu2012/webSite

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml
del templates file