Modificare gitignore
Removed ignored files
Solved merge