zanette pull
merge conflict resolved
adding gitignore