hello world
Merge branch 'master' of github.com:inqbation/my_repository

* 'master' of github.com:inqbation/my_repository:
  Simulated conflict
Conflicto solucionado