gona merge
Merge branch 'master' of https://github.com/dgershte/squiggle

Conflicts:
	AR_mediaStream_three.html
	demos/AR_simple_webgl.html
gon merge
Merge branch 'master' of https://github.com/dgershte/squiggle

Conflicts:
	squigglenew/index.html
removed stuff