k
Merge branch 'master' of https://github.com/miguel-solis/retosapp

Conflicts:
	asdftmp/cache/models/retosapp_cake_model_default_retos_ganadores
	tmp/cache/models/retosapp_cake_model_default_retos_list
	tmp/cache/models/retosapp_cake_model_default_retos_posts
	tmp/cache/models/retosapp_cake_model_default_retos_premios
	tmp/cache/models/retosapp_cake_model_default_retos_reportes
	tmp/cache/models/retosapp_cake_model_default_retos_retos
	tmp/cache/models/retosapp_cake_model_default_retos_users
	tmp/cache/models/retosapp_cake_model_default_retos_users_retos
	tmp/cache/persistent/retosapp_cake_core_file_map
	tmp/cache/persistent/retosapp_cake_core_method_cache
	tmp/logs/error.log
Merge branch 'master' of https://github.com/miguel-solis/retosapp

Conflicts:sdf
	tmp/cache/models/retosapp_cake_model_default_retos_ganadores
	tmp/cache/models/retosapp_cake_model_default_retos_list
	tmp/cache/models/retosapp_cake_model_default_retos_posts
	tmp/cache/models/retosapp_cake_model_default_retos_premios
	tmp/cache/models/retosapp_cake_model_default_retos_reportes
	tmp/cache/models/retosapp_cake_model_default_retos_retos
	tmp/cache/models/retosapp_cake_model_default_retos_users
	tmp/cache/models/retosapp_cake_model_default_retos_users_retos
	tmp/cache/persistent/retosapp_cake_core_cake_dev_es-es
	tmp/cache/persistent/retosapp_cake_core_cake_es-es
	tmp/cache/persistent/retosapp_cake_core_default_es-es
	tmp/cache/persistent/retosapp_cake_core_file_map
	tmp/cache/persistent/retosapp_cake_core_method_cache
	tmp/logs/error.log
asdfasd
Merge branch 'master' of https://github.com/miguel-solis/retosapp

Conflicts:
	asdftmp/cache/models/retosapp_cake_model_default_retos_ganadores
	tmp/cache/models/retosapp_cake_model_default_retos_list
	tmp/cache/models/retosapp_cake_model_default_retos_posts
	tmp/cache/models/retosapp_cake_model_default_retos_premios
	tmp/cache/models/retosapp_cake_model_default_retos_reportes
	tmp/cache/models/retosapp_cake_model_default_retos_retos
	tmp/cache/models/retosapp_cake_model_default_retos_users
	tmp/cache/models/retosapp_cake_model_default_retos_users_retos
	tmp/cache/persistent/retosapp_cake_core_file_map
	tmp/cache/persistent/retosapp_cake_core_method_cache
	tmp/logs/error.log