Coding Conventions
Merge pull request #1 from sboeck/master

Coding Conventions