Fixed 3 bugs
Merge branch 'rendererBranch' of https://github.com/jtmzheng/3dss.git
into rendererBranch

Conflicts:
	src/renderer/Model.java