added s to merchant
Merge branch 'master' of https://github.com/rlmark/uTunes
merged merchant/merchants
adding categories to product page
Moved DS_Store into .gitignore
moved app/views/.DS_Store into gitignore
fixed gitignore