Content
Merge branch 'master' of https://github.com/cyponthemic/Flexbox-challenge

Conflicts:
	function.php