working on a style guide
Merge pull request #241 from gecampbell/master

working on a style guide