aCaldwell/ResearchOpprotunities — pull request #2 by damanza2144 (2012-12-05 20:39:52+00:00)
Title: Here is the merge of Aaron, Swathi, and David's changes

Aaron,

This is the manual merge of Aaron, Swathi, and David's changes. I am sorry it took a while, this was the first time I had to do a manual merge, but it was worth the effort. I learned a lot and documented what I did, if you need help let me know.

Regards,
David