update
Merge branch 'master' of https://github.com/Gibus91/eit2.git

Conflicts:
	EIT2/bin/org/polytech/eit2/projet/FileBrowser.class
	EIT2/bin/org/polytech/eit2/projet/Main.class
	EIT2/src/org/polytech/eit2/projet/FileBrowser.java
	EIT2/src/org/polytech/eit2/projet/Main.java