added draw functions into the game scene
merge fixing
merge fixing