images are in progress
Merge branch 'master' of https://github.com/KernelCorp/almadeladanza

Conflicts:
	Gemfile.lock
	db/schema.rb
images are in progress
images upload is done #al-5 fixed