HazelGirl, you were upset, and you had the right to be upset. I'm glad you and your friend worked it out. Please don't feel guilty. Learning to do this sort of stuff - deal with your own feelings and how they 'mix' with others' feelings is part of growing up. A bloody uncomfortable part if I may say so myself... I'm only learning this stuff too and I'm probably a good 15 years older than you
I think you should be proud of yourself for working through this one.