resolving merge
resolving merge conflict
generated javadoc files
added test 5 double append fix
killed the pinacolata
cleared everything
Merge branch 'master' of github.com:liangvic/ChunkyMonkeys into jessica
cleared log file
Starting real work on the locking
reading from config file
Fixing the locking
Fixing locking conflicts
Testing