started hinds and hounds game
fixed merge conflict