Update M_C1
Merge branch 'master' of
https://github.com/KMDTeamProject/test_branching.git

Conflicts:
	src/git/branching4/M_C1.java
Add C2 to B5