smileytime
Merge branch 'master' of https://github.com/Ithanil/CG-Prakt14

Conflicts:
	testing/Three JS/physobjs.js
	testing/Three JS/zweicanvas.html