No more local settings on git
Some tweaks
some styling