Merge branch 'gh-pages'
rm bold text
rm lunchbunny link
Merge branch 'master' into gh-pages