Complete q5
Merge branch 'master' of github.com:wyclin/edinburgh