refactoring
Merge branches 'master' and 'master' of github.com:lukaselmer/ethz-raytracer

Conflicts:
	public/src/raytracer.coffee
	public/src/raytracer.js