added gitignore
Merge branch 'import'