Merge remote-tracking branch 'origin/luis'
assets compiled
agregadas imagenes ramdon para posts
modified images
new images categories
Merge remote-tracking branch 'origin/luis'
vendor assets
Merge remote-tracking branch 'origin'

Conflicts:
	public/assets/manifest-f5c38f1982b5fa8802fb9b78cfbf4880.json
Banderitas
Banderitas
bunlde install add gems
date picker
gemfile modify
database
Deploy vps
Añadido cambios de issues
Merge branch 'master', remote branch 'origin'
fixed bugs
Merge branch 'master', remote branch 'origin'
update database