Gear cahnges
Merge remote-tracking branch 'origin/master'

Conflicts:
	mainPage.html
Merge branch 'master' of https://github.com/Allen-Duxbury-Solutions/CurrentProject

Conflicts:
	mainPage.html