new
Merge branch 'master' of https://github.com/jpcharrier/coding-standards into change-2
Merge pull request #3 from jpcharrier/change-2

Change 2