1
2
Merge branch 'testbranche1'

Conflicts:
	P1/src/Main.java
3
s
Merge branch 'testbranche1'

Conflicts:
	P1/src/Main.java
4
s
Merge branch 'testbranche1'
c1
c2
c3
c2
Merge branch 'testbranche1'