Added setUpGame functionality #10
fix merge #10