修改footer高度
Merge branch 'gh-pages' of https://github.com/narutooturan/zhiping into gh-pages

Conflicts:
	js/script.js