linea 2
Merge branch 'master' of https://github.com/Luiyit/WidgetTest

Conflicts:
	clase.txt