Did I make this girl jealous or mad?

sounds like she was jealous that you were talking to other girls. give it a couple days and try to talk to her again... she didnt straight up tell you that it was making her uncomfortable, maybe the guy was talking about some other girl? anyway good luck!