Initial Commit
Resolve gitignore conflict