fixed sorcery version
resolving merge conflict on pull
generated Friendship model and controller, added routes and associations between User and Friendship
added boolean accepted column to friendship table
Added in profile view for current user
added in friends list to user profile, method to generate complete friends list to userscontroller
added links to friend profiles from friendlist
added ability to accept friend requests, only display as friends those friendships which have been accepted
fixed bug with js creation of geomarkers
removed unnecessary function and styling
added ability for users to ignore friendship requests
implemented buttons in user profiles that differ based upon status of friendship between users
refactored control flow to determine if/which buttons to display in user profile
completed functionality for accept friendship button when viewing another user's profile
fixed add friend button, refactored request_pending? user method
added basic dropdown menu for friends buttonin friends profile
add ability to destroy friendship
added ability to cancel friend request
refactored event listener in user profile
refactored interaction on acceptance of friendship from other users profile