Remove infinite scrolling
Merge branch 'master' of https://github.com/cicadas-2014/quipspot into remove_infinite_scrolling
inifinite scroll on the main page only
Merge branch 'master' of https://github.com/cicadas-2014/quipspot into remove_infinite_scrolling
Update format for no bookclub quotes
Merge pull request #96 from jjow/no-bookclubs-styling

Update format for no bookclub quotes
Merge pull request #97 from davek09/fix_twitter_helper

Fix twitter helper
Merge branch 'master' of https://github.com/cicadas-2014/quipspot into infinite_scrolling_2
Merge pull request #98 from raghav1987/infinite_scrolling_2

Infinite scrolling 2
Complete welcome carousel
Merge branch 'master' of https://github.com/cicadas-2014/quotemunk into style_pagination
update positioning on welcome page
Fix merge conflicts
Merge pull request #99 from ksin/style_pagination

Style pagination
Merge pull request #100 from jjow/welcome_styling

Welcome styling
removed rake command from controller
Merge branch 'master' of https://github.com/cicadas-2014/quotemunk into fix_twitter_helper
moved loader gif