Confused about my friend?

The other day....my bestfriend Hannah I knew her since I was 6 years old and Im 16 now.She was over my house and she came on to me and she kissed me.I was shocked... but I liked it so we keep the kissing [not a peck I mean making out] until it became .I liked it but then i didnt because I was tought that it was wrong... and I dont know what to say to her now and I have a boyfriend and I dont want him anymore...cause all I can think about is her.Is it alright to feel like this? help please