init
Update README.md
Merge branch 'master' into gh-pages
fixed tracking, changed color
Merge branch 'master' into gh-pages