Merge branch 'master' of https://github.com/hloureiro/test_repo

Conflicts:
	doc.txt
ccccc
Merge branch 'master' of https://github.com/hloureiro/test_repo

Conflicts:
	doc.txt