fix merge conflict.
fix merge conflict.
Merge branch 'master' into gh-pages
Merge pull request #2 from chrismattmann/gh-pages

add participants