Merge pull request #6989 from adiaaida/updateCodingConventions
authorMichelle McDaniel <adiaaida@gmail.com>
Wed, 31 Aug 2016 17:45:08 +0000 (10:45 -0700)
committerGitHub <noreply@github.com>
Wed, 31 Aug 2016 17:45:08 +0000 (10:45 -0700)
Update coding conventions


Trivial merge