updated style guide
Merge pull request #2 from fleur/master

updated style guide