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
merging problem resoved
Merge pull request #10 from billy1339/laurenfazah-master

merging conflicts resolved