lots of changes
Fixed the borked things
fuck the gear
halpMerge remote-tracking branch 'origin/master'

Conflicts:
	CrunchTime/gear.png
Images fixed