WP theme.
Merge remote-tracking branch 'origin/master'

Conflicts:
	config.rb
	index.html
	sass/_index.scss