Rotation ok
Merge branch 'master' of https://github.com/mkila/MasterPilot

Conflicts:
	src/fr/umlv/main/Main.java