Merge branch 'master' of github.com:chrifpa/HCI1

we don't use the tabby kind of tabs here. however they're called.
Merge branch 'master' of github.com:chrifpa/HCI1