added scrolling
scrolling text fixed
Merge branch 'master' of github.com:130610/sd-project