Working on edit profile page
Merge branch 'master' into caitlin
Users can edit their profile info successfully
Merge pull request #40 from sweetrocker22/caitlin

Caitlin