updated gitignore
pulled down changes and merged stuff

idk what that was about.