initial commit
conflito de gitignore