Create .gitignore
Delete .gitignore
Merge origin/master into jannik
changed gitignore