Br1_B1
Br1_B2
Merge branch 'Br1_31102013'

Conflicts:
	GitTestPr2/src/main/MainClass.java