stopcriterion finished
Merge init/master
java files removed