Removed and change some functions
Changed the Gear Class
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/resources/Functions.class
	src/resources/Functions.java