no edits
Merged and fixed conflicts
Added a friend request counter to the all events page
Added styling to the profile page
Merge branch 'master' of https://github.com/NicHaley/popr
Merge branch 'syling-profile-page'