+ Got rid of merge conflicts (see below)
This should be good to go, but please be careful to check everything
carefully. :) Basically I just replaced the gui folder and resources
folder.  Tokanagrammar.java also had conflicts so I just replaced it w/
my copy.
+ updated ver
Merge pull request #50 from Tokanagrammar/gui2

merge GUI2 branch - tokens can now be dragged and dropped. Slightly new look-and-feel