day 17 21418 words
Merge branch 'master' into gh-pages
fixed a conflic error message