clean-up and edit gitignore
Added margin values to be able to set sperately.