Updated gitignore
Cleanup
Merge crap
dsokfkds