fixed merge conflicts
Merge branch 'master' of https://github.com/dfminnojr/MinnovativeSolutions into Sharif
fixed .ds
tuesday
tuesday
tuesday
tuesday
Fixed Carousel
Pictures added
Merge pull request #6 from dfminnojr/Sharif

Sharif