Add java file
Add python file into featureJava branch to test conflicts
Fix conflict -- keeping 'Hello you ;-)'