added gitignore
Merge branch 'master' of https://github.com/junsup/cs-182-jun-tim

merging
merging again