Änderungen + library , packages
Merge remote-tracking branch 'origin/master'

Big fat merge in your face

Conflicts:
	src/general/Root.java
	src/shapes/Cube.java
	src/shapes/Pyramid.java