test
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Modele/Perspective.java
Merge branch 'master' of C:\Users\Alexis\Documents\GitHub\Lab4_Perspective with conflicts.
Merge branch 'master' of C:\Users\Alexis\Documents\GitHub\Lab4_Perspective with conflicts.