Initial commit on gh-pages branch
fix merge conflict.  I hope I did it right