fix scroll bug
Merge branch 'master' of github.com:zenozeng/freshman