+ 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
- ignore incomplete tests
- APIs.newUser() does not have to call persistUser anymore
Merge pull request #51 from Tokanagrammar/ignore_incomplete_tests

- ignore incomplete tests
add build_notes.txt to specify builder along with a timestamp
Merge pull request #52 from Tokanagrammar/build_notes

add build_notes.txt to specify builder along with a timestamp
add timestamp to commit message
clean up
quit build if any sub-step fails
pull master and resolve conflicts