First commit
conflito gitignore