Who is the heir of Gryfinndor?

It might be Harry Potter because of when he pulled the Godric Gryfinndors sWord out of the sorting hat and Dumbledor said it takes a real Gryfinndor to pull the sWord out of the hat... so maybe he was referring that he is a descendant of Godric Gryfinndor... :S maybe