error fixed (external functions)!
Merge branch 'master' of https://github.com/Laird-Dave/ws1314_info2lab

Merging stuff from notebook and netbook