Sounds a whole lot like patellafemoral syndrome (Runners Knee).
Instead of me describing it, here is a couple of links. You can read it and see if it matches with your injury:
http://running.competitor.com/2010/12/injuries/beating-runners-knee_143
http://www.drpribut.com/sports/spknees.html
http://en.wikipedia.org/wiki/Patellar_tendinitis
My prewash:)
Haley,
Have you tried massaging your quads with the hard roller or tried to identify tender parts in your quads? Sometimes it can be a knotted up quad that leads to all sorts of knee pains.
I hope that it gets better bc I hate to see u in there having to hoof it in the water!!!
"Carpe Diem"