Merge pull request #39 from sweetrocker22/caitlin

Caitlin
Merge branch 'master' into caitlin
Users can edit their profile info successfully