coding standards
Merge pull request #1 from masterpuppet/master

Conding Standards