added ability to view profile. schema updated
Fixed merge conflict
deleted some heads from the merge
Fixed merge conflict again
Created model tests for Friendship and Friend Requests
Added photo functionality to getaways
fixed merge conflict