what did i do?

I say you should keep on pursuing her. You like her, she likes you, sounds good. =)

As for your friend. He should be able to understand that you guys still have feelings for each other...

isn't there sum rule out there that says friends should not date you ex?

hope thins go well for ya...if your really in love with this gurl, never give up.