added ribbon
fixed ribbon link
Merge branch 'master' into gh-pages