MAJ mineure cyril

Rien de spécial ;)
Merge branch 'master' of https://github.com/Mistercpp/DrawAway

Conflicts:
	DrawAway2/DrawAway2/app/src/main/java/com/example/app/Circle.java

	DrawAway2/DrawAway2/app/src/main/java/com/example/app/GeometryLayer.java
	DrawAway2/DrawAway2/app/src/main/java/com/example/app/MainActivity.java
	DrawAway2/DrawAway2/app/src/main/java/com/example/app/Triangle.java