mise ajour de mon depos local
merge
Merge branch 'master' of https://github.com/thefuture2092/GoTech

Conflicts:
	src/presentation/EditPanel.java