Stuff I have been working on
Delete .getClientSlots.php.swp
Delete .getVolunteerSlots.php.swp
Merge https://github.com/TSA-HCI573/PetProject into Steven

Conflicts:
	includes/constant/config.inc.php
Trying to Merge the branches
Merge branch 'Steven' of https://github.com/TSA-HCI573/PetProject into Steven