Have I done the right thing?

[Pink Floyd]

That's a tough situation. While you like the girl (boy?) you have another friend that likes the same person. I can understand that haha. I've been in similar situations. What I did was I told my friend that me and the other person agreed that we would be best for each other, and that I felt it was Ok to be with her, because I was just following what my heart told me. So trust your gut, do what you think is right. If you want to be with her/him, talk to your friend about it and tell them, honestly, how you feel.

Good luck.