local commit
Merge remote-tracking branch 'origin/revealjs' into revealjs

Conflicts:
	wp-content/themes/pixelis-wp/css/main.css