Merge pull request #1 from marshawjs/marsha-reid

Marsha reid
Merge pull request #55 from marshawjs/master

finished profile page