Fixed the mask and cathegorie bits, so now the bullets don't collide with the player when getting shop.  Also fixed the collision circle around the player, but it isn't perfect mainly because I'm using test graphics.