hdfg
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/products/macollection.php
sfgfsgdfg
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/products/macollection.php
sdqfsd
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/products/macollection.php