Done

Signed-off-by: Developer B
Almost dome

Signed-off-by: Developer C
Merge with Developer A changes
sdf
Merge branch 'conflict_trunk_developer_B' of github.com:FireFry/MyProject into conflict_trunk_developer_B

Conflicts:
	src/com/firefry/testmodel/git/conflict/ConflictKeeper.java
Almost dome

Signed-off-by: Developer C
j
Merge branch 'conflict_trunk_developer_C' of github.com:FireFry/MyProject into conflict_trunk_developer_C
Added arg to A

Signed-off-by: Developer D
Merge branch 'conflict_trunk_developer_D_from_A' of github.com:FireFry/MyProject into conflict_trunk_developer_D_from_A

Conflicts:
	src/com/firefry/testmodel/git/A.java