cloning and forking images
Merge branch 'master' of https://github.com/animalito/github_tutorial

Created a conflict!