CSS Changes
Merge branch 'master' of https://github.com/kawfee/TaylorCampusInfo

Conflicts:
	Website/json_feed.txt
Removed duplicate file