Fixed Merge
Added Ignore for .class files