Merge pull request #60 from mikeshulman/forupstream

Draft of a style guide
Added acceptable tactics from Jason