Added second line DOG
Merge branch 'master' of https://github.com/francisbautista07/git_training

Conflicts:
	file1.txt