Do you think he was flirting?

He sounds like he's flirting with you but it's hard to tell if it's more on his part. But good luck just keep being his friend and flirting and maybe he'll begin to like you as you like him!