Update custom_functions.php
Update custom_functions.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	custom_functions.php