Support for child themes
Merge branch 'master' of https://github.com/Coffee-Themes/coffee-shortcodes

Conflicts:
	README.md
	ce-shortcodes.php
asd