scroll problem fixed
Merge branch 'master' of github.com:hmslydia/frenzy2