STD or infection?

So last week my vagina was itching really bad and I had some discharge. It seemed like possible yeast infection or some sort of bacterial infection, but there was also like one or 2 bumps as well. They went away after a few days and the itching is better all on its own. Any explaintion?