Github_conflits LOCAL

<<<<<<< HEAD

=======

Github_conflits REMOTE

Lorem ipsum

e1378572dda02f15b5d4594c24411b6d1238cf02

Name		Name	Last commit message	Last commit date
Latest commit History 5 Commits
README.md		README.md