removed error.Java files
Merge tag 'iteration2'