Merge branch 'master' of https://github.com/TSA-HCI573/PetProject

Conflicts:
users/profile.php
updated profile.php

updated profile to pull user info from db
profile.php

profile.php
profile

profile