My relationship help?

Last night at my baseball game, me and my friend sam ususally pick on each other, but in a friend way. I said hey, sam where's your makeup? (the black stuff you put under peoples face in b-ball) He said what make up? The black stuff. He said its not make up. Then skipping on a few words, i said your whole face is makeup. Then he hit me a couple times with his glove and fists on my arm. my parents reccommended i sit by him in the doug out, so i tried to sit by him, and he moves away! Then he says I can't use his bat that his parents said i could. Then I told him good game and all, he didn't say anything. I told him good catching (hes a catcher) he said nothing. He told me I'm being a smart-alec. I was just joking! I really was! Now I can't stop thinking about it! Its haunting me. And by the way, i'm in pain right now, because when i'm typing, my arm hurts that bad!