3rd commit
Merge branch 'master' of github.com:edvelezg/myprj

Conflicts:
	asd.txt