CSS
Merge remote-tracking branch 'origin/master'

Conflicts:
	wp-content/themes/granit/library/css/style.css