ready to production
Merge branch 'ember' of github.com:markson/Shopping-Site into ember

Conflicts:
	app/templates/application.hbs
	app/templates/products/index.hbs