2 repos con la config de git
Merge branch 'master' of https://github.com/gooznt/guiapp
Merge branch 'master' of https://github.com/gooznt/guiapp

Conflicts:
	gus.txt
Merge branch 'master' of https://github.com/gooznt/guiapp