templates modify
Merge branch 'master' of github.com:coolbit-in/linux_xidian

Conflicts:
	linux_xidian/templates/index.html