NAACP copy
Merge branch 'master' of https://github.com/bnmry/bnmry.github.io

Conflicts:
	_posts/2014-08-28-what-brands-can-learn-from-the-naacp.md