Initial commit
Resolved .gitignore merge error