initial commit
Merge .gitignore