d
Merge branch 'master' of https://github.com/ufo-hunters/ufohunters-site

Conflicts:
	Gemfile.lock
Merge branch 'master' of https://github.com/ufo-hunters/ufohunters-site
Merge branch 'master' of https://github.com/ufo-hunters/ufohunters-site

 the commit.
cdn cloudinary cache
cdn cloudinary cache
Merge branch 'master' of github.com:fjfdepedro/ufohunters-site

Conflicts:
	config/cloudinary.yml
Merge branch 'master' of github.com:ufo-hunters/ufohunters-site
Merge branch 'master' of github.com:ufo-hunters/ufohunters-site
href cloudinary image property like a thumbnail
Manually merged
Manually merged