added changes to notes, friend requests, and challenges
added new pages
fixed merge conflicts