continue of print file
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/vue/Fenetre.java