First upload
Merge branch 'master' of github.com:JuantAldea/UGR-2012-industrial-robotics