stayHungry

stay hungry ,stay foolish add a new line to test conflict == add a new line and testing conficts. Conflicts occured when we merged the second branch, after fixing the conflict manually we can merge it successfully.