fix some scrollin
Merge pull request #54 from RKim220/ryan

Ryan
Merge pull request #55 from RKim220/ryan

fixed navslide
Merge branch 'master' into ajax
Merge pull request #56 from RKim220/filter

Filter
page scrolling play
fix merge conflicts
Merge pull request #57 from RKim220/ajax

Ajax
merge