Deployed: Merge pull request #159 from natespain/standards-guide

generated from commit 7797f3ad4be3fb0f5f3490ac9c57597146cc298b