no message
Merge branch 'master' of https://github.com/techXplored/technology-explored-wptheme

Conflicts:
	assets/scss/base/_content.scss
	assets/scss/style.scss
	header.php
	style.css
	style.css.map
	templates/search.php