You need to rest it, basically - 3 weeks without activity, I think.
I do think, though, that the fact your shoulder hurts is significant. Can you lift your arm above your head? Can you life your arm up and to your side? Were you doing repeated lifts of the weights about your head? Tendinitis is another possibility.
One shouldn't self-diagnose on Google , but does any of this seem familiar?