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

Conflicts:
	output/testscenes/Camera.png
factored solving of quadratic into own method