Initial Commit
Fixed .gitignore conflict