#395 Test corrector. Ajustament de colliders d'escopeta i pstola ja que permetia fer grans salts al player
Merge branch 'devel' of https://github.com/eloipuertas/ES2013Dijous into devel