Renderer fix
Added Geometry
Merge branch 'master' of https://github.com/Merigrim/indafps

Conflicts:
	src/se/kth/csc/indafps/Renderer.java