created new branch
Merge branch 'master' into mybranch
Merge branch 'master' of https://github.com/generalgmt/AndelaAPI
conflict resolved