Initial commit
Merge gitignore