initial commit
merges .gitignore