everything works kind of
updated .gitignore
Fixed merge conflicts