putting css/js files in the page.php pagetype for condensing/combining purposes
Merge branch 'master' of https://github.com/StudentLifeMarketingAndDesign/student-health

Conflicts:
	themes/simple/templates/Includes/Footer.ss