Delete .DS_Store
Delete .gitignore
Delete .gitignore
Resolving conflcit
Merge branch 'master' of https://github.com/FluffyPira/flirt-bot
Resons