fixed the friends list and added tests to test it out
fixed email functionality and made it either add a friend or invite a friend
starting working on the settling up feature. Almost done but still busted
fixed merge conflicts
changed dashboard html