update the git merge command.
Merge branch 'gh-pages' of https://github.com/tijptjik/FEWD into gh-pages