Stuffs I added
Merge branch 'master' of https://github.com/chickdan/MCS-Website

Conflicts:
	navbar.php