add infinite scroll to branch
pull from master
about to add eugene's refactored updates
merge with eugene
merge with eugene
resolve merge conflict
add rough rough animation to test on heroku
Merge branch 'master' of github.com:newenegue/peek_frontend into ellie_friday2b