sorted selector gear
Merge remote-tracking branch 'origin/master'

Conflicts:
	mainPage.html
	style/general.css