changed gitignore
removed non-ascii characters
merge conflict resolved