dd
Merge branch 'master' of https://github.com/Hao8816/kmk_website

Conflicts:
	kmk_website/media/js/index.js
	kmk_website/media/style/index.css
	kmk_website/settings.py
	kmk_website/settings.pyc
	kmk_website/templates/kmk_home.html
	kmk_website/templates/kmk_index.html
	kmk_website/templates/kmk_info.html