merge conflict per usual
work please
synced QuizSite's init methods with prototypes from other classes. Updated Messages, Note, Challenge, FriendRequest, User, Friend, perhaps more, to use proper model
merge conflict