first commit
merged .gitignore