Initial commit
Resolve gitignore conflict.