Was he hitting on me or trying to befriend me?

He went Waaaaay out of his way to spend time with you. Extra time, in fact. He likes you. Just keep texting him back and expect a date to occur soon- otherwise set up a study date and see what happens.