Update code_style.md
Merge branch 'master' of https://github.com/phittipaldi/SolidSubdivision into phittipaldi-master
Put scala in correct section
Minor change on descriptive_commits
Merge branch 'master' of https://github.com/amhed/SolidSubdivision