Fixing conflict ar local repo
Merge branch 'master' of github.com:Mardiniii/articles-make-it-real