initial commit
merged .gitignore