fixed a little
changed again
Merge remote-tracking branch 'origin/gh-pages'