changed sample.java to add my hello world from my branch
Merge remote-tracking branch 'origin/master' into jeremy