Fixed Makefile with correct paths.
Updates to learn-by-example.
Merge branch 'refs/heads/master' into gh-pages