change Hello.java
Merge branch 'master' of https://github.com/lien1992/sword.git

Conflicts:
	src/Hello.java