Initial commit
Merging gitignore