Updated conding_conventions.txt.
Updated conding_conventions.txt.

dsroche/flint2,wbhart/flint2,jpflori/flint2,jpflori/flint2,dsroche/flint2,dsroche/flint2,fredrik-johansson/flint2,wbhart/flint2,jpflori/flint2,dsroche/flint2,wbhart/flint2,jpflori/flint2,fredrik-johansson/flint2,fredrik-johansson/flint2