Added its brilliant
Merge branch 'master' of https://github.com/BBForever/myfirstgit

corrected the conflict