more work on 1.1, commit befor merge 1.2 and 2
Merge branch 'master' of https://github.com/skrogh/31606-handson9
1.1 and 3.1 done