uncomment global
Merge remote-tracking branch 'origin/master'

Conflicts:
	scss/old-ie.scss