merging problem resoved
Merge pull request #10 from billy1339/laurenfazah-master

merging conflicts resolved
solved conflicts for merge
Merge pull request #12 from billy1339/master

No. 2 ajax request for individual image sets up and running. now can type url ex: image_sets/1 and on the front page link takes you to image_sets/1
Merge branch 'master' of github.com:A-team-GA/pixelect_client2
fixed broken carousel