Added gitignore
fix merge