Merge branch 'master' of https://github.com/mzwicker/Rendering-Algorithms-2014-Skeleton

actually this was a pseudo merge...