updates friend location data type from float to string for user show page
fixes merge conflict in schema
Merge pull request #55 from ilanasufrin/emily

Emily