Adding new itens to gitignore

Adjusted so in merge process we don't have anymore conflicts with auto-generated files/personal configuration files