I believe my course of action should be to talk with them, and if not something I like, then move on, but still I would like to remain with this company. I don't know about you, but where I live, there is mega demand for computer science grads. It sounds like you've done the right things to get yourself ahead with this organization by interning with them before graduation, and by pursuing additional training after you were hired full-time. Continuing education definitely speaks to an organization by letting them know that you are interested in improving your skills in the field in which you work. If you feel that you have developed a strong record with this organization in the two years that you've worked for them, then it's time for you to speak up for yourself.
Salary negotiation is scary, and it takes both confidence and preparation in order to do it right.
You've gotten off to a good start by investigating the average salary for CS graduates. You can find out just how much someone with your training and education can command in your field. One thing that I suggest you do is talk with someone in a professional organization, such as the Association of Computing Machinery . Professional recruiters are good resources, too. The second thing that I suggest you do is get your hands on a copy of Negotiate Your Job Offer by Mary B. Simon.