tocando un poquito la apariencia (1)
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/SGP_Q03.iml
	.idea/workspace.xml