Putte can now attack piggies
Fixed merge conflicts