add .gitignore
Merge branch 'jem' into jay