update from juno 3
Merge branch 'master' of git@github.com:fuco-suzuki/practice.git

Conflicts:
	HelloJava/src/org/sweetsmile/practice/Hello.java