Merge pull request #4 from Jastro/master

k
prueba 2
Merge pull request #5 from Jastro/Jastro

probando Jastro
Merge pull request #6 from Jastro/Jastro

probando update
Update obj_prueba.object.gmx
Merge pull request #7 from Armeys/Armeys

Update obj_prueba.object.gmx
Merge pull request #8 from Jastro/Armeys

Armeys
Merge pull request #9 from Jastro/master

puff
Merge pull request #10 from Jastro/Armeys

Merge pull request #9 from Jastro/master
Merge pull request #11 from Jastro/master

+