initial commit
Merge gitignore