Testing for Infinite Scroll
Merge pull request #95 from krunalshahmo/master

settings work
Merge pull request #96 from krunalshahmo/master

integrated genre customization with settings tab
Merge branch 'master' of git://github.com/nkacena/Software-Engineering-Project
Merge pull request #97 from JakobKlinger/master

Added Infinte Scroll Tester
hopefully merge issues fixed
Merge pull request #100 from LandonVance/settingsfix

hopefully merge issues fixed
fixing more merge issues
Merge pull request #101 from LandonVance/fbshare

fixing more merge issues
Merge remote-tracking branch 'upstream/master'