Compiled with TypeScript 1.0
Merge branch 'gh-pages' of github.com:wtarr/Thesis into gh-pages

Conflicts:
	src/noiseRendering.js