ignore some junk files
Merge branch 'master' into #304