fixed infinite scroll masonry
fixed merge conflicts
Merge pull request #32 from ManyBaby/fixing-infinite-scroll-masonry

fixed infinite scroll masonry