profile page and css changes
SOLVED MERGE CONFLICTS
MERGE BRANCH 'danny'

Merging the changes made in Danny's branch after conflicts have been resolved.