primer commit
Merge branch 'master' of http://github.com/armandyn/Practica_2