changes
merge fix
added gitignore