replaces exercise with ex 1, 2 and 3
Merge branch 'master' into gh-pages