changed nb_pump to no_pumps for explicity sake
added marked status for hydrants
Merge pull request #4 from tudorbarascu/master

Changed nb_pump to no_pumps and added marked status to hydrant.