- Commit in order to pul
Commit in order to pull
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/smoothproducts.js
	app/styles/lib/smoothproducts.css