Hands-on 6 Group13
Merge pull request #15 from jorgegvalencia/master

Hands-on 6 Group13
Hands-on 6 Group13
Merge branch 'master' of https://github.com/k3xr/Curso2014-2015
Merge pull request #269 from k3xr/master

OK.