Added images and background image to templates
Fixed merge conflicts in new_game.erb