More Stuff
Merge branch 'master' of https://github.com/SharpenedSpoon/wp-content

Conflicts:
	themes/genesis-nmtheme/css/visual_style.css
asDasdasDASfasfaF