update gitignore
merge code
merge code