add gitgore
Merge branch 'zac'