Just yesterday I did something to my neck/shoulder, thanks to a combination of computer use and a poorly placed backpack strap.

A hot shower and gentle stretching seem to have done the trick for right now...