Update CodingConventions.md
Update CodingConventions.md
cr fixes
Merge pull request #39 from Wikia/coding-conventions-11

Update CodingConventions.md
Merge branch 'master' into typescript