in progress fixing infinite scrolling
Merge branch 'master' of https://github.com/RKim220/project4