Not Normally A Drinker (mostly Water Drinker), I Had Two

Not normally a drinker (mostly water drinker), I had two frozen margarittas with salt; then ate fish and chips in restaurant. A few hours later, woke up with moderate to severe pain in upper right abdomen. Still sore and tender next day, but pain is not getting worse. I have never had this happen before. What might be the problem? I thought perhaps appendix, then gall bladder, kidney stones, ??? Please help!