src/app/view/View.java
Merge branch 'master' of https://github.com/FabienSalles/agregateurContenueM1Java

Conflicts:
	src/app/view/Main.java