Initial Commit
Added .gitignore
Fixed merge conflict