Need to Commit for Merger

try your best to ignore the changes made in ViewGameActivity