added bar
test
bar2
test
Merge branch 'branch1'

Conflicts:
	code/gittest/src/gittest/Foo.java