working version
merged .gitignore