update the git merge command.
Merge branch 'gh-pages' of https://github.com/tijptjik/FEWD into gh-pages
Prepare lesson7 and 8.
add ecardly feedback.
typo background-image.
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages