first draft of exercise 2
Merge branch 'me134a#exercise-2'