A few weeks ago I went to the doctor about my shoulder. While I thought it may have been dislocated, (mostly because of the popping and extreme pain when moving it) he was pretty sure it wasn't, and that it was just a torn muscle. He said to give it two weeks to heal and it should be fine.
Now it's been two weeks, and while most of the pain is gone now, it still hurts and generally feels abnormal moving it certain directions. It also still makes a popping noise.
My doctor didn't seem real concerned about the popping, though. So is this abnormal popping part of a torn muscle? Is there something else I can do to help fix it? Or should I visit my doctor again within a certain time?