Revert "Fixa Gitignore"

This reverts commit ebaa9ccbfc746a2c1506a481068890a249fc0603.
Revert "Revert "Fixa Gitignore""

This reverts commit 5315d1fae33690b28e56bcc056c2a146bd19c11a.
Merge remote-tracking branch 'origin/master'