edit gitignore
merger master