Merge pull request #4 from Aquaird/gh-pages

Correct Teacher Header
山山的resource_list冲突修改
添加student的header
Merge branch 'gh-pages' of github.com:crabyh/Teaching-Assistant-Website into gh-pages

Conflicts:
	rescourse_list.html