testing merge
Merge branch 'master' of https://github.com/Tarlen/mood

Conflicts:
	app/controllers/products_controller.rb
update