git ignore
git ignore
Merge branch 'jennwu-master1'
dding more stuff to gitignore