123
Merge branch 'master' of https://github.com/Jorgtre/test into 1

Conflicts:
	doc1.txt
Merge branch '1'