Merge branch 'master' of github.com:lwholeyCPSC/348_TFM

Conflicts:
	addCustomer.php
stuff