Removed conflicts in files
Updated several sub-headers to match nicholas' style. Updated font to be really NeueLight
Reduced navbar to all lower case. Updated images in home
Updated overview values to match requirement
Updated Facilities pages to fit design
Completed JCRC page
Updated JCRC page with proper descriptions
SCRC page completed
Fixed bug in jcrc/scrc page causing font to not display correctly
Updated text for jcrc and scrc
Hall administration completed
Identity completed
Videos completed
Anniversary completed
Merging, deconflicting

Merging Nicholas' branch with master
Merge branch 'master' of https://github.com/KR-Infotech/website

Conflicts:
	assets/css/main.css
	partials/navbar.partial.php

I'm not too good at this
Merge pull request #1 from KR-Infotech/master

integrate changes