merging
Merge branch 'billy1339-master'
Merge branch 'master' of github.com:A-team-GA/pixelect_client2
fixed broken carousel
Merge pull request #14 from laurenfazah/master

Carousel Fixed