redoing some stuff I had to undo
updated .gitignore