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

generated from commit 0ee99799ba0a550438ed26fe660537797c12b0ef