first shopaholic commit
error corrected on index
error on develop corrected
Merge branch 'develop' into staging