add gitignore file
change
merge the code