N'importe quoi
Merge branch 'master' of https://github.com/stevenremot/RaSKlett
Merge branch 'master' of https://github.com/stevenremot/RaSKlett
Petits arrangements
Merge branch 'master' of https://github.com/stevenremot/RaSKlett

Conflicts:
	src/graphicInterface/Editor.java
	src/graphicInterface/MainWindow.java