My great changes !
Merge remote-tracking branch 'origin/master'

Conflicts:
	CustomMainGUI/src/custommaingui/LibraryFunction.java
My mistakes