updating gitignore
merging local branch with remote