editing the proposed git convention
Merge branch 'docs/git' into docs/master
clean up issues from syntax errors and warnings
Merge branch 'bugs/cleanup'