file structuring
Merge branch 'master' into carousel
Added some styles