initial commit
merging .gitignore