This is inappropriate at work, right?

I'm 20 y/o in a college internship. I'm currently working and at oil company corporate building. And in my mind any touching is inappropriate at work. I like giving hugs to people I care about and all but still.

There is this guy who works here, he's a father of three (all under ten), use to work with the US Army when he lived in his home country. He seems like an honest, hard working man (dangerous people usually seem normal).

On top of that, the woman I work closely with has warned me of the chatter boxes, which he is one, but nothing else.

So what I really want to talk about is his actions. He'll come to my desk from time to time and talk for a little (since I'm not a big talker), and give side hugs. In the beginning he just kinda tickled me one and I told him to stop. Other that than his little side hugs are it. But today he came to say hi, gave his usual side hug and asked how I was. I told his I was a little tired. He came over and put his hand on my shoulder, found a knot. He then moved and rubbed my shoulder till it was gine, then another, then moved to the other side and did the same. Then he felt my neck, mentioned it was tense. THEN HE FUCKING POPPED MY NECK! I've never have my neck popped so I feel great right now.

But.... No touching :(

IDK