Errors in this file
Merge branch 'master' of https://github.com/sheilaschoepp/UBCCPSC304

Conflicts:
	checkOut.php