Merged function_exists(  'theme_support' )
Merge remote-tracking branch 'origin/master'

Conflicts:
	functions.php
Rebuild functions.php