changed .gitignore
merged with 1.2