this is a change
Merge https://github.com/vandervidi/sample2
Merge https://github.com/vandervidi/sample2

Conflicts:
	hello/src/hello/helloclass.java
Merge https://github.com/vandervidi/sample2
changed the number