foo 1

foo 2

first change in cr-001

Merge branch 'cr-001'

Conflicts:
	HelloWorld/src/Hello.java

clipse