updated .gitignore, added some weird includes that I don't understand