format fix
settings changes
formating changes
Merge branch 'general' into programming
configurations changes