conflict 수정
Merge branch 'master' of https://github.com/minivertising/minivertising

Conflicts:
	wp-content/themes/Workality-Lite-master/_header.php