initial commit
adjusted gitignore
merged .gitingore