commit
Merge branch 'master' of https://github.com/hmsln/scrollable_div

Conflicts:
	js/scrollbar.js