changed file location
file changed location again
changed to project file
bombModel change
Changing viewcontroller transition to the gamecontroller
Appropriate values updated
merge and solve merge conflict