hot fix
hot fix1
Merge branch 'HotFix'

Conflicts:
	HelloWorld/src/ClassOne.java