Merge branch 'master' of https://github.com/yasushisakai/algodeq_app

Conflicts:
	myproject/myproject/templates/main.html
started the never ending journey of three.js.....