File to conflict
Merge branch 'master' of https://github.com/Flip120/ClaseGit