merge
Merge branch 'master' of https://github.com/thefuture2092/GoTech

Conflicts:
	src/presentation/ParametrePanel.java