quick fix
Merge branch 'master' of http://github.com/SharpenedSpoon/wp-content

Conflicts:
	themes/genesis-nmtheme/functions.php