Merge branch 'laurenfazah-gh-pages'
Merge branch 'master' of github.com:A-team-GA/pixelect_client2
edited fonts, navbar, carousel margin
centered carousel content
minor style tweaks - removed li bullet style
test images in place for size
modified for merge
merging problem resoved
Merge pull request #10 from billy1339/laurenfazah-master

merging conflicts resolved
Merge branch 'billy1339-backbone_routes'
merged conflicts
Merge branch 'billy1339-backbone_routes'
Merge branch 'master' of github.com:laurenfazah/pixelect_client2 into laurenfazah-master
Merge branch 'laurenfazah-master'
merging
Merge branch 'billy1339-master'
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