working on real scroll bar...
merged
Merge branch 'master' of github.com:dali-lab/interactive-directory

Conflicts:
	scripts/main.js