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

Conflicts:
	doc1.txt