test commit 2
test merge
Merge branch 'master' of https://github.com/Shadowere/Lab1

Conflicts:
	Squelette-lab1/src/Cercle.java
Merge branch 'master' of https://github.com/Shadowere/Lab1
Merge branch 'master' of https://github.com/Shadowere/Lab1
Merge branch 'master' of https://github.com/Shadowere/Lab1
PMD Rectangle
Merge branch 'master' of https://github.com/Shadowere/Lab1
PMD