I just saw an article on here that talks about shoulder and neck pain and some of the basic stretches from the article have been helping me.
They are as follows:
Shake your head yes, then shake your head no, then shake your head side to side. Lastly do a slow roll of the neck. All of this should be slow and steady with no forcing of the muscles, just relax and control your head smoothly.
The article said to do this twice a day to stretch the muscles.