basic scrolling added
finished fixing merge conflicts
added infinite scrolling capability
fixed merge conflicts from homepage.html and style.css
Merge pull request #31 from rickarubio/ss-js-scrolling

Ss js scrolling