fix some scrollin
Merge branch 'master' into ajax
page scrolling play
fix merge conflicts
Merge pull request #57 from RKim220/ajax

Ajax