commit inesperado, a ver que se arruina XD
Merge branch 'master' of github.com:spunkjockey/tg-2012-sicpro