two product  to single product
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/index.blade.php
	app/views/master.blade.php
index accordion
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/index.blade.php
11-30 fix