added cone and cylinder
Merge remote-tracking branch 'origin/master'

Conflicts:
	sourcecode/project1/Project1/frag.glsl
	sourcecode/project1/Project1/shape.h