It sounds like you should have a doctor look at it. Icing it (15 min with ice, then 45 min off ice) and Ibuprofen might also help with the pain.
It also sounds like you shouldn't be trying to work out on it while you are still in pain. I learned this myself the hard way. I had a knee injury and I was convinced I could work out through the pain (I'm tough
). All I did was an incline walk on the TM and the end result was an ankle injury in addition to the knee injury. It put a complete damper on a hiking trip I had planned and also meant a lot longer recovery time. You are better off taking a few days off from working out and seeing a doctor, than continuing to try to tough it out and possibly having to take a lot longer off.