Messing with the camera type
Merge remote-tracking branch 'origin/master'

Conflicts:
	whale.js
OrthographicCamera?