Update doc1.txt
ver 2
Merge branch 'master' of github.com:Adrian-Cuellar/doc_prog

Conflicts:
	doc1.txt