Helpful stuff, yeah right
Merge branch 'master' of github.com:michael-cannon/wordpress-theme-helpers

Conflicts:
	custom_functions.php