#208 posar objectes a escena correctament
Merge branch 'Grupo-CD' of https://github.com/eloipuertas/ES2013Dimarts into Grupo-CD