Adding footer
Merge branch 'master' of https://github.com/at15/design.sjtu

Conflicts:
	site/assets/img/home/depart-wenguan.jpg
Merge branch 'master' of https://github.com/at15/design.sjtu