wang
Merge branch 'master' of https://github.com/qdayy/2014.juhe

Conflicts:
	Juhe/Home/View/Index/index.html