merging......
add files
Merge branch 'master' of https://github.com/at15/design.sjtu

Conflicts:
	site/assets/css/home.css
	site/assets/css/teacher.css
	site/index.html
	site/teacher/index.html