added gitignore
Merge remote-tracking branch 'astro/master'