added
Merge branch 'master' of https://github.com/andelgado53/git_practice

Conflicts:
	doc_1.txt