updating gitignore
possibly fix diverged branch message?