update gitignore
Merge remote-tracking branch 'origin/dlc_1' into dlc_1