modify gitignore
Merge branch 'master' of github.com:robin-zhao/rzTimeline