try-github-conflict

In order to learn how to use Github, let's challenge to many things in this repository.