fixed null error in scrollbar
Merge branch 'master' of https://github.com/HansonDodge/DirtyGirl