test deployement on github
Merge branch 'gh-pages' of https://github.com/FNNDSC/slicedrop2 into gh-pages

Conflicts:
	index.html
	scripts/collaboration.js
	scripts/db.js
	scripts/main.js
	scripts/slicedrop2.js
	scripts/upload.js
	scripts/utils.js
	scripts/visualization.js
	scripts/ww_load.js