random commit in case this POS mac dies
added orbit controls
Merge branch 'master' of github.com:merpnderp/Planet

Conflicts:
	public/Planet.js
	public/heightMapFragmentShader.glsl
Please let this be the end of the merge disaster.