Initial commit...
Resolved .gitignore conflict