merge new gitignore and fixed english lotr .csf from 1061