I am really confused and need your advice...?

It seems pretty obvious that you both have a crush on each other. Ask him if he still wants that night together, and if he does, you may have a new bf.