Adding product price
Merge branch 'master' of github.com:hegemonia/dibstarter

Conflicts:
	db/schema.rb