added game class
 merged conflicts