Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
change color

added a new color to merge branches
Merge branch 'gh-pages'
added 401 error

added to the 401 error message in order to merge branches.