merge working (needs more testing)
removing all *.class files from the tree
some merging. Mostly just commented out Gudberger's code so we can do a real merge later