Changed OtherClass again
Changed OtherClass again
Changed OtherClass : Doing nothing or something!
Merge zulu

Conflicts:
	src/main/java/com/mycompany/dummy/OtherClass.java