contact done
linked js to all other pages
Merge remote-tracking branch 'origin/tal' into wes

Conflicts:
	assets/js/about.js
	assets/libraries/headerAndFooter.php