added in game pause button
Fixed merge conflicts