Added arg to A

Signed-off-by: Developer D
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