add text to Feng in intro
erge branch 'master' of github.com:felixmulder/ingproc3