first commit
Hello
change 2
change 3
change 4
change 45 (branch iss53)
Merge branch 'iss53'

Conflicts:
	src/main/java/com/example/Hello.java