initial commit
merge on .gitignore