sync
added a folder for different pages
Merge remote-tracking branch 'origin/jeff' into wes
Merge remote-tracking branch 'origin/tal' into wes

Conflicts:
	assets/js/about.js
	assets/libraries/headerAndFooter.php
missed a <<<HEAD
git lied to me!! found a spot where there was another conflict
Merge remote-tracking branch 'origin/wes' into tal