removed unnecessary text
fixed conflict
made some changes
Merge branch 'master' into gh-pages