Who do you think it was that Luffy saw at the end? At first I thought Garp but the way Luffy spoke to him it doesn't seem right. Maybe Dragon? (Unlikely I know but I can still wish...)