You have probably had nagging shoulder or neck pain, got a shoulder massage, which didn't get you back 100% and were then frantically looking for answers and help how to get better fast.
First of all, you are not alone in that quest. As a massage therapist I observe that most people have some form of shoulder or neck tensions at some point in their lives.
Here I would like to share my 15+ years of massage experience and provide you with a comprehensive checklist how to eliminate that muscle tension and how to prevent it from happening.  This list below doesn't apply if you had a car accident or serious injury. For more severe injuries, make sure you see a medical doctor, osteopath, sports injury specialist or chiropractor.

If you are working in front of a computer all day,

make sure you take stretching breaks! Get a timer or alarm clock and schedule a 2 - 3 minute exercise and stretching routine every full hour. Or download office  stretching programs including hourly reminders to take care of your aching muscles and joints..
Our bodies are not meant to sit in front of a screen for 8+ hours per day!  If you can, why not schedule a massage at a Day Spa close by on a regular basis? 
       

Utilize downtime in the office to stretch those frozen muscles!

Stretch when you are waiting for a meeting to get started, when you wait for the copier to finish its job, when standing in line at the cafeteria, at the coffee machine etc. 

Are you sleeping on your side?

If you do, make sure that your head is supported. The triangular space between the side of the head and your shoulder makes up a hollow. That means that the side of the head can easily crunch against your shoulder while you are sleeping. My suggestion is to keep the current pillow set up under the head and additionally use an extra smaller pillow to put into that gap between head and shoulder so that the head is supported while sleeping. This is so easy and very effective.

Is your workstation at the office set up ergonomically?

• If not, ask your employer to help you with this. If you are working out of your home, some simple adjustments can make a difference.
• Most of the time the computer keyboard is too high. So simply raise your chair and find a comfortable position.
• Make sure that you don't have to look up in order to focus on the screen in front of you. For the computer monitor to sit on a box might not make sense. Be able to look straight at the screen.
• Sit with a straight back - a back pillow for extra support is a good idea. Also a stool for you feet might help to have a more comfortable position and promotes to maintain a straight back.

Are you still cradling the phone?

Get a headset, those are inexpensive and will make a vast difference.

Are you carrying a heavy computer bag to work?

The answer here is to have your computer bag on wheels. Again, this is a very simple solution.

Some of these questions above might apply to you, maybe all of them apply or just one. They all are major contributing factors of causing your neck and shoulders to accumulate tension over time. Make those easy adjustments to your home and work life and see if they make the pain go away.
Additionally a therapeutic massage at spa near you might not be a bad idea either. A regular rhythm of getting a therapeutic massage, sports massage or deep tissue massage will help maintain healthy muscles and joints and give you a sense of wellbeing and inner calm. You will be better equipped to deal with the growing demands of work life. And finally, a regular fitness workout routine will contribute to your health and overall ability to cope with the complexity of our lives and make you simply feel good about yourself.