test
Merge remote-tracking branch 'origin/Feature1'

Conflicts:
	HelloWorld/src/ClassOne.java
Merge branch 'HotFix'

Conflicts:
	HelloWorld/src/ClassOne.java