more work on planning for tourguide
Merge branch 'master' of https://github.com/katadh/leiaS14