css
Merge branch 'master' of https://github.com/loveskai/CSCI588.git

Conflicts:
	CSCI588/website/css/style.css