stuf..
Merge branch 'master' of https://github.com/justayak/computerGrafik_2014
more things
Merge branch 'master' of https://github.com/justayak/computerGrafik_2014

Conflicts:
	src/aufgabe41/phong/DiffuseLight.java
	src/aufgabe41/phong/Scene.java
add some extras