reconfigured gitignore
fixing merge