some profile page styling
fixed merge conflict
Merge pull request #51 from meara/awesome_testing

some profile page styling