added merge output files and gedit backup files to the .gitignore
Merge branch 'master' into moreObstacles:transversal changes:added stuff to the .gitignore