merged

Everything is in game.fla now