Improved infinite scrolling
merge

Merge branch 'master' of https://github.com/Aristekrat/hipstertron_data