initial comment
Merge branch 'master' of https://github.com/wangj29/department-website

Conflicts:
	.gitignore