Initial commit (added more files)
gitignore
merge conflict