Other Links Edit
fixd sum shit
Minor update for ajax testing
Fixed ajax

Rebasing

Rebasing still
Merge branch 'master' of https://github.com/ecsmith/p33psmrkt

Conflicts:
	Catering.html
	Community.html
	ContactUs.html
	Sustainability.html
	index.html