#395 Test corrector. De posicio de terres i de collider de l'escopeta 2
Merge branch 'devel' of https://github.com/eloipuertas/ES2013Dijous into devel