updat
Merge branch 'master' of github.com:cis-vipin/demostore

Conflicts:
	app/models/image.rb
updat