modified .gitignore and settings