@janeAir - I totally agree about the ice. I was diagnosed with bursitis and tendonitis resulting in neck and shoulder pain and I was told to ice the swollen area. In addition, I was give a range of exercises to perform each day meant to strengthen my muscles and straighten out my shoulder.
Both of these have helped. I also had to pay attention to correcting my posture, as this is what caused the problem in the first place.
If these treatments don't work, your doctor will probably recommend cortisone but that should be a last resort, as cortisone has been shown to weaken muscles through prolonged use.